Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 73c27124 authored by liboyang's avatar liboyang
Browse files
Options

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

parents f347816d a4134df4
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 42 deletions
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 73c27124
......@@ -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
View file @ 73c27124
......@@ -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/mapper/TaskListMapper.java
View file @ 73c27124
......@@ -222,7 +222,16 @@ public interface TaskListMapper {
* @param taskEntity 任务单
* @return
*/
@Insert("insert into task (CARD_TYPE,COUNTY_CODE,SUBMIT_NAME,TASK_STATE_ID) values(#{cardType},#{countyCode},#{submitName},#{taskStateId})")
@Insert("<script> insert into task (CARD_TYPE,COUNTY_CODE,SUBMIT_NAME,TASK_STATE_ID " +
"<if test = 'workGroup != null'> " +
",work_Group" +
" </if>" +
") values(#{cardType},#{countyCode},#{submitName},#{taskStateId}" +
"<if test = 'workGroup != null'> " +
",#{workGroup}" +
" </if>" +
") " +
"</script>")
@Options(useGeneratedKeys=true, keyProperty="taskId", keyColumn="TASK_ID")
public boolean saveTask(TaskEntity taskEntity);
......@@ -267,7 +276,7 @@ public interface TaskListMapper {
* @param date 查询时间
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
// "task.ISSUED_DATE,task.ISSUED_NAME,\n" +
// "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -286,7 +295,7 @@ public interface TaskListMapper {
* @param date 查询时间
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
"task.ISSUED_DATE,task.ISSUED_NAME,\n" +
// "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -305,7 +314,7 @@ public interface TaskListMapper {
* @param date 查询时间
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
"task.ISSUED_DATE,task.ISSUED_NAME,task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,\n" +
// "task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -324,7 +333,7 @@ public interface TaskListMapper {
* @param date 查询时间
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
"task.ISSUED_DATE,task.ISSUED_NAME,task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,\n" +
// "task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -343,7 +352,7 @@ public interface TaskListMapper {
* @param date 查询时间
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
"task.ISSUED_DATE,task.ISSUED_NAME,task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME,"+
// TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -362,7 +371,7 @@ public interface TaskListMapper {
* @param date 查询时间
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
"task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -584,7 +593,7 @@ public interface TaskListMapper {
* 辅助库 快证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
// "task.ISSUED_DATE,task.ISSUED_NAME,\n" +
// "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -602,7 +611,7 @@ public interface TaskListMapper {
* 辅助库 快证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
// "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
" '快证' CARD_TYPE ,\n" +
......@@ -619,7 +628,7 @@ public interface TaskListMapper {
* 辅助库 快证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME," +
// "task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -637,7 +646,7 @@ public interface TaskListMapper {
* 辅助库 快证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME," +
// "task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -655,7 +664,7 @@ public interface TaskListMapper {
* 辅助库 快证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME," +
// "TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -673,7 +682,7 @@ public interface TaskListMapper {
* 辅助库 快证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME, '快证' CARD_TYPE ,\n" +
" '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
......@@ -877,7 +886,7 @@ public interface TaskListMapper {
* @param
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
// "task.ISSUED_DATE,task.ISSUED_NAME,\n" +
// "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -896,7 +905,7 @@ public interface TaskListMapper {
* @param
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
// "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
"'余证' CARD_TYPE ,\n" +
......@@ -913,7 +922,7 @@ public interface TaskListMapper {
* 辅助库 余证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME," +
// "task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -931,7 +940,7 @@ public interface TaskListMapper {
* 辅助库 废证
* @return
*/
@Select("select FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select FAILED_CARD.work_group,FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"FAILED_CARD.PRINT_DATE PRINT_OUT_DATE,'' PRINT_OUT_NAME,'废证' CARD_TYPE ,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, \n" +
"1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO GROUP_NO ,FAILED_CARD.work_group from FAILED_CARD \n" +
"left join task on FAILED_CARD.task_id= task.TASK_ID \n" +
......@@ -946,7 +955,7 @@ public interface TaskListMapper {
* 辅助库 余证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME," +
// "task.CONCORA_CRUSH_DATE,\n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -980,7 +989,7 @@ public interface TaskListMapper {
* 辅助库 余证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME," +
// "TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
......@@ -999,7 +1008,7 @@ public interface TaskListMapper {
* 辅助库 废证
* @return
*/
@Select("select FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select FAILED_CARD.work_group,FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"FAILED_CARD.PRINT_DATE PRINT_OUT_DATE,'' PRINT_OUT_NAME,FAILED_CARD.POSITION_DATE POSITION_DATE,'' POSITION_NAME," +
" FAILED_CARD.ALLOT_DATE CONCORA_CRUSH_DATE ,'' CONCORA_CRUSH_NAME " +
",'废证' CARD_TYPE ,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, \n" +
......@@ -1007,7 +1016,7 @@ public interface TaskListMapper {
"left join task on FAILED_CARD.task_id= task.TASK_ID \n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where to_char(FAILED_CARD.ALLOT_DATE,'yyyyMMdd') = #{date} and FAILED_CARD.work_group =#{workGroup} order by FAILED_CARD.ACCEPT_NO")
"where to_char(FAILED_CARD.POSITION_DATE,'yyyyMMdd') = #{date} and FAILED_CARD.work_group =#{workGroup} order by FAILED_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed4(@Param("date") String date,@Param("workGroup") String workGroup);
......@@ -1016,7 +1025,7 @@ public interface TaskListMapper {
* 辅助库 余证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME,'余证' CARD_TYPE ,\n" +
"'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
......@@ -1032,7 +1041,7 @@ public interface TaskListMapper {
* 辅助库 废证
* @return
*/
@Select("select FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@Select("select FAILED_CARD.work_group,FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"FAILED_CARD.PRINT_DATE PRINT_OUT_DATE,'' PRINT_OUT_NAME,FAILED_CARD.POSITION_DATE POSITION_DATE,'' POSITION_NAME," +
" FAILED_CARD.ALLOT_DATE CONCORA_CRUSH_DATE ,FAILED_CARD.FINISH_DATE CONCORA_CRUSH_NAME,'' PUNCHING_DATE,'' PUNCHING_NAME" +
",'废证' CARD_TYPE ,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, \n" +
......
src/main/java/com/yxproject/start/service/impl/CardDetailedListServiceImpl.java
View file @ 73c27124
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
View file @ 73c27124
......@@ -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
View file @ 73c27124
......@@ -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
View file @ 73c27124
......@@ -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
View file @ 73c27124
......@@ -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
View file @ 73c27124
......@@ -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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment