添加在受理库中查询制证信息 （typelist、cityList、groupList）

修改保存任务单页面
添加并修改状态为1的任务单页面

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

@@ -149,19 +149,18 @@ public class UserApi {
      *
      * @return
      */
-    @RequestMapping(value = "/addProductionTaskList", method = RequestMethod.GET)
-    @RequiresPermissions("userInfo.add")//权限管理;
+    @RequestMapping("saveTask")
+//    @RequiresPermissions("userInfo.add")//权限管理;
     @ResponseBody
-    public String addProductionTaskList(@RequestParam("id") String id, HttpServletResponse resp) {
-        String map = "{\"productionTaskListId\":\"20181016001\",\"makeType\":4,\"oldMakeType\":7}";
-        JSONObject jsonObject = JSONObject.fromObject(map);
-        Object taskList = jsonObject.get("taskList");
-        Object groupInfoList = jsonObject.get("groupInfoList");
-        List<GroupNoEntity> groupNoEntities = (List<GroupNoEntity>) groupInfoList;
-        TaskEntity taskEntity = (TaskEntity) taskList;
+    public String addProductionTaskList(@RequestParam("typeCode") String typeCode,@RequestParam("importTime") String importTime,@RequestParam("cityCode") String cityCode, HttpServletResponse resp) {
+        List<Map<String, Object>> groupListAtACCU = groupListService.findGroupListAtACCU(typeCode, importTime, cityCode);
+        TaskEntity taskEntity = new TaskEntity();
+        taskEntity.setCard_Type(Long.valueOf(typeCode));
+        taskEntity.setCitycode(cityCode);
+        taskEntity.setTask_State_Id((long)1);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
-        int i = taskService.addProductionTaskListEntity(taskEntity, groupNoEntities);
+        int i = taskService.addProductionTaskListEntity(taskEntity, groupListAtACCU);
         yxjsonResponse.outPutSuccess(i + "添加成功");
         return yxjsonResponse.toJSONString();
     }
@@ -247,6 +246,7 @@ public class UserApi {
      * @return
      */
     @RequestMapping("addFailedinfo")
+    //    @RequiresPermissions("userInfo.add")//权限管理;
     public String addFailedinfo(@RequestParam("idNo") String idNo, HttpServletResponse resp) throws Exception {
         JSONObject jsonObject = JSONObject.fromObject(idNo);
         Map<String, List> map = jsonObject;
@@ -400,6 +400,20 @@ public class UserApi {
         return yxjsonResponse.toJSONString();
     }
 
+    /**
+     * 通过任务单查询组列表;
+     *
+     * @return
+     */
+    @RequestMapping("getGroupListAtACCU")
+//    @RequiresPermissions("userInfo.add")//权限管理;
+    public String getGroupListAtACCU(@RequestParam("typeCode") String typeCode,@RequestParam("importTime") String importTime,@RequestParam("cityCode") String cityCode, HttpServletResponse resp) {
+        List<Map<String, Object>> groupListAtACCU = groupListService.findGroupListAtACCU(typeCode, importTime, cityCode);
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(groupListAtACCU);
+        return yxjsonResponse.toJSONString();
+    }
 
     /**
      * 查询TypeList通过状态;
@@ -413,8 +427,6 @@ public class UserApi {
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(typeListEntity);
-        Map map = new HashMap();
-//      map.put("MakeType",productionTaskListEntity);
         return yxjsonResponse.toJSONString();
     }
 
@@ -430,8 +442,37 @@ public class UserApi {
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(cityListEntity);
-        Map map = new HashMap();
-//      map.put("MakeType",productionTaskListEntity);
+        return yxjsonResponse.toJSONString();
+    }
+
+
+    /**
+     * 查询TypeList通过状态;
+     *
+     * @return
+     */
+    @RequestMapping("getTypeListByImportDateAtACCU")
+//    @RequiresPermissions("userInfo.add")//权限管理;
+    public String getTypeListByImportDateAtACCU(@RequestParam("importTime") String importTime, HttpServletResponse resp) {
+        List<TypeListEntity> typeListEntity = typeListService.findTypeListByImportDateAtACCU(importTime);
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(typeListEntity);
+        return yxjsonResponse.toJSONString();
+    }
+
+    /**
+     * 查询CityList通过状态;
+     *
+     * @return
+     */
+    @RequestMapping("getCityListByImportDateAtACCU")
+//    @RequiresPermissions("userInfo.add")//权限管理;
+    public String getCityListByImportDateAtACCU(@RequestParam("importTime") String importTime,@RequestParam("cardType") String cardType, HttpServletResponse resp) {
+        List <CityListEntity> cityListEntity = cityListService.findCityListByImportDateAtACCU(importTime,cardType);
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(cityListEntity);
         return yxjsonResponse.toJSONString();
     }
 

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

@@ -205,7 +205,7 @@ public class TaskEntity {
         this.is_Exception = is_Exception;
     }
     @Basic
-    @Column(name = "PRINTER_ID", nullable = true, precision = 0)
+    @Column(name = "PRINTER_ID", nullable = false)
     public long getPrinter_Id() {
         return printer_Id;
     }

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

@@ -4,6 +4,7 @@ import com.yxproject.start.entity.GroupListEntity;
 import com.yxproject.start.entity.GroupNoEntity;
 import com.yxproject.start.entity.SpecialCardEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -21,6 +22,7 @@ public interface GroupNoMapper {
     public List<Map<String,Object>> findSpecialCountyList(String task_Id);
     public List<Map<String,Object>> findNormalCountyList(String task_Id);
     public List<GroupListEntity> findGroupListByTaskId(String taskId);
-
+    public List<GroupListEntity> findGroupNoListAtACCU(@Param("importTime")String importTime,@Param("typeCode")String cardType,@Param("cityCode")String cityCode);
+    public List<Map<String,Object>> findGroupListAtACCU(@Param("typeCode")String typeCode,@Param("importTime")String importTime,@Param("cityCode")String cityCode);
 
 }

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

@@ -13,7 +13,7 @@ import java.util.Map;
 @Mapper
 public interface TaskMapper {
     public List<TaskEntity> findTaskEntity(long id);
-    public int insertTaskEntity(TaskEntity taskEntity);
+    public long insertTaskEntity(TaskEntity taskEntity);
     public  int updateTaskEntity(TaskEntity taskEntity);
     public  List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo);
     public List<TaskEntity> findTaskEntityByState(int state);
@@ -21,6 +21,8 @@ public interface TaskMapper {
     public int replaceExceptionInformation(@Param("taskId") String taskId, @Param("isException") String isException);
     public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
     public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId, @Param("cardType") String cardType);
+    public List<TypeListEntity> findTypeListByImportDateAtACCU(String importTime);
+    public List <CityListEntity> findCityListByImportDateAtACCU(@Param("importTime") String importTime, @Param("cardType") String cardType);
     public int updateOutStorageDate(String taskId);
     public int updateInStorageDate(String taskId);
     public int updateStorageDate(String taskId);

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

@@ -12,6 +12,7 @@ import java.util.Map;
 @Service
 public interface CityListService {
     public  List <CityListEntity> findCityList(String taskStateId, String cardType);
+    public List <CityListEntity> findCityListByImportDateAtACCU(String importTime,String cardType);
 
 //    public  List <CityListEntity> findCityListByCardType(String cardType);
 }

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

@@ -3,6 +3,7 @@ package com.yxproject.start.service;
 import com.yxproject.start.entity.GroupListEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/18.
@@ -10,5 +11,6 @@ import java.util.List;
 
 public interface GroupListService {
     public List<GroupListEntity> findGroupListByTaskId(String taskId);
+    public List<Map<String,Object>> findGroupListAtACCU(String typeCode,String importTime,String cityCode);
 
 }

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

 package com.yxproject.start.service;
 
-import com.yxproject.start.entity.GroupListEntity;
-import com.yxproject.start.entity.GroupNoEntity;
-
 import java.util.List;
 import java.util.Map;
 

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

@@ -12,7 +12,7 @@ public interface TaskService {
 
     public int updateProductionTask(TaskEntity taskId);
 
-    public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities);
+    public int addProductionTaskListEntity(TaskEntity taskEntity, List<Map<String, Object>> groupListAtACCU);
 
     public int addQuickCyclesheetInfo(String acceptNo);
 

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

@@ -10,4 +10,6 @@ import java.util.List;
 public interface TypeListService {
 
     public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
+    public List<TypeListEntity> findTypeListByImportDateAtACCU(String importTime);
+
 }

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

@@ -63,7 +63,31 @@ public class CityListServiceImpl implements CityListService {
         for (CityListEntity cityListEntity : list1) {
             List <GroupListEntity> groupListEntities=groupNoMapper.findGroupListByTaskId(cityListEntity.getTaskId() + "");
             if(groupListEntities.size() == 1 ){
-                cityListEntity.setGroupNo(String.valueOf(groupListEntities.get(0).getGroupNo()));
+                cityListEntity.setGroupNo(groupListEntities.get(0).getGroupNo()+"");
+            } else if(groupListEntities.size() > 1 ){
+                List<Integer> c = new ArrayList<>();
+                List<Integer> nsList = new ArrayList<>();
+                for (int i = 0; i < groupListEntities.size(); i++){
+                    nsList.add(Integer.parseInt( groupListEntities.get(i).getGroupNo()+"" ));
+                }
+                cityListEntity.setGroupCount(nsList.size());
+                cityListEntity.setGroupNo(createGroupNo(c, nsList));
+            }else {
+                cityListEntity.setGroupNo("");
+            }
+            list2.add(cityListEntity);
+        }
+        return list2;
+    }
+
+    @Override
+    public  List <CityListEntity> findCityListByImportDateAtACCU( String importTime,String cardType) {
+        List<CityListEntity> list1 = taskMapper.findCityListByImportDateAtACCU(importTime,cardType);
+        List<CityListEntity> list2 = new ArrayList<CityListEntity>();
+        for (CityListEntity cityListEntity : list1) {
+            List <GroupListEntity> groupListEntities=groupNoMapper.findGroupNoListAtACCU(importTime,cardType,cityListEntity.getCitycode());
+            if(groupListEntities.size() == 1 ){
+                cityListEntity.setGroupNo(groupListEntities.get(0).getGroupNo()+"");
             } else if(groupListEntities.size() > 1 ){
                 List<Integer> c = new ArrayList<>();
                 List<Integer> nsList = new ArrayList<>();

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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/18.
@@ -31,4 +32,16 @@ public class GroupListServiceImpl implements GroupListService {
         return  groupList;
     }
 
+    @Override
+    public List<Map<String,Object>> findGroupListAtACCU(String typeCode,String importTime,String cityCode) {
+        List<Map<String, Object>> groupListAtACCU = groupNoMapper.findGroupListAtACCU(typeCode, importTime, cityCode);
+        for ( Map<String,Object> map:groupListAtACCU) {
+            List <SpecialCardEntity> specialCardEntities=specialCardMapper.findSpecialCardList(map.get("GROUP_NO").toString());
+            map.put("SpecialCardList",specialCardEntities);
+        }
+        return  groupListAtACCU;
+    }
+
+
+
 }

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

@@ -103,17 +103,20 @@ public class TaskServiceImpl implements TaskService {
      * 生成任务单并保存组号列表
      *
      * @param taskEntity 任务单详情
-     * @param groupNoEntities        组号列表
+     * @param groupListAtACCU        组号列表
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities) {
-
-        int production_task_list_seq = utilMapper.findProductionTaskListSequenceNextValue();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
-        taskMapper.insertTaskEntity(taskEntity);
-        for (GroupNoEntity groupNoEntity : groupNoEntities) {
+    public int addProductionTaskListEntity(TaskEntity taskEntity, List<Map<String, Object>> groupListAtACCU) {
+        long taskID = taskMapper.insertTaskEntity(taskEntity);
+        for (Map<String,Object> map : groupListAtACCU) {
+            GroupNoEntity groupNoEntity = new GroupNoEntity();
+            groupNoEntity.setGroup_No(map.get("GROUP_NO").toString());
+            groupNoEntity.setTask_Id(taskID);
+            groupNoEntity.setValid_Count(Long.valueOf(map.get("VALID_COUNT").toString()));
+            groupNoEntity.setInvalid_Count(Long.valueOf(map.get("INVALID_COUNT").toString()));
+            groupNoEntity.setSpecial_Card_Count(((List)map.get("SpecialCardList")).size());
             groupNoMapper.insertGroupNoEntity(groupNoEntity);
         }
 

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

@@ -27,4 +27,14 @@ public class TypeListServiceImpl implements TypeListService {
         List<TypeListEntity> typeListEntity = taskMapper.findTypeListByTaskStateId(taskStateId);
         return typeListEntity;
     }
+    /**
+     * 通过状态查找TypeList
+     * @param
+     * @return
+     */
+    @Override
+    public List<TypeListEntity> findTypeListByImportDateAtACCU( String importTime ) {
+        List<TypeListEntity> typeListEntity = taskMapper.findTypeListByImportDateAtACCU(importTime);
+        return typeListEntity;
+    }
 }

src/main/resources/mapper/GroupNoMapper.xml

@@ -50,6 +50,23 @@
         group by GROUP_NO
     </select>
 
+    <select id="findGroupListAtACCU" resultType="java.util.HashMap" parameterType="String">
+        select acc_group_t.group_no,acc_group_t.valid_count,acc_group_t.invalid_count,acc_group_t.deal_flag,
+ to_char(acc_group_t.submit_date,'yyyyMMdd')submit_date,SPECIALCARD.SPECIALCARDcount,
+ acc_group_t.submit_code,acc_group_relation_t.original_no,substr(original_no,21,1),to_char(acc_group_t.import_time,'yyyyMMdd') import_time
+from acc_group_t@accu_dblink
+inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
+left join (select count(SPECIAL_CARD.ACCEPT_NO) SPECIALCARDcount ,SPECIAL_CARD.GROUP_NO from SPECIAL_CARD group by SPECIAL_CARD.GROUP_NO) SPECIALCARD  on acc_group_t.group_no = SPECIALCARD.GROUP_NO
+where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime}
+and substr(original_no,0,4) = substr(#{cityCode},0,4)
+    </select>
+    <select id="findGroupNoListAtACCU" resultType="com.yxproject.start.entity.GroupListEntity" parameterType="String">
+        select acc_group_t.group_no groupNo from acc_group_t@accu_dblink
+inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
+where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime}
+and substr(original_no,0,4) = substr(#{cityCode},0,4)
+    </select>
+
 
 
 

src/main/resources/mapper/TaskMapper.xml

@@ -28,10 +28,17 @@
     </select>
 
 
-    <insert id="insertProductionTaskListEntity"  parameterType="com.yxproject.start.entity.TaskEntity">
-    Insert into TASK (TASK_ID,CARD_TYPE,OLD_CARD_TYPE,CITYCODE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,
-    OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID)
-    values (#{task_Id},#{card_Type},#{old_Card_Type},#{citycode},#{submit_Date},#{issued_Date},#{print_State},#{download_Date},#{print_Out_Date},#{position_Date},#{out_Workshop_Date},#{quality_People_Name},#{quality_Test_Date},#{exception_Information},#{out_Storage_Date},#{in_Storage_Date},#{task_State_Id},#{is_Exception},#{printer_Id})
+    <insert id="insertTaskEntity"  parameterType="com.yxproject.start.entity.TaskEntity" useGeneratedKeys="true" keyProperty="task_Id">
+    Insert into TASK (CARD_TYPE,OLD_CARD_TYPE,CITYCODE,TASK_STATE_ID,PRINTER_ID)
+    values (#{card_Type},
+        <if test="old_Card_Type!=null">#{old_Card_Type},</if>
+        <if test="old_Card_Type==null">null,</if>
+    #{citycode},
+        <if test="task_State_Id!=null">#{task_State_Id},</if>
+        <if test="task_State_Id==null">null,</if>
+        <if test="printer_Id!=null">#{printer_Id}</if>
+        <if test="printer_Id==null">null</if>
+        )
     </insert>
 
     <update id="updateTaskEntity" parameterType="com.yxproject.start.entity.TaskEntity">
@@ -95,6 +102,15 @@
         GROUP BY CARD_TYPE_DIC.CARD_TYPE,TASK.CARD_TYPE
     </select>
 
+    <select id="findTypeListByImportDateAtACCU" resultType="com.yxproject.start.entity.TypeListEntity" parameterType="String">
+        select  substr(original_no,21,1) typeCode,sum(valid_count ) typeCount,CARD_TYPE_DIC.CARD_TYPE AS typeName
+from acc_group_t@accu_dblink
+inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
+left join  CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID =substr(original_no,21,1)
+where  to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime}
+group by substr(original_no,21,1), CARD_TYPE_DIC.CARD_TYPE
+    </select>
+
     <select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity" parameterType="String">
         SELECT CARD_TYPE AS cardType,TASK.CITYCODE AS citycode,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,TASK.TASK_ID AS taskId,OLD_CARD_TYPE AS oldCardType,SUBMIT_DATE AS submitDate,ISSUED_DATE AS issuedDate,PRINT_STATE AS printState,DOWNLOAD_DATE AS downloadDate,PRINT_OUT_DATE AS printOutDate,POSITION_DATE AS positionDate,OUT_WORKSHOP_DATE AS outWorkshopDate,QUALITY_PEOPLE_NAME AS qualityPeopleName,QUALITY_TEST_DATE AS qualityTestDate,EXCEPTION_INFORMATION AS exceptionInformation,OUT_STORAGE_DATE AS outStorageDate,IN_STORAGE_DATE AS inStorageDate,TASK_STATE_ID AS taskStateId,IS_EXCEPTION AS isException,PRINTER_ID AS printerId
         from  TASK
@@ -104,6 +120,23 @@
         GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID
     </select>
 
+    <select id="findCityListByImportDateAtACCU" resultType="com.yxproject.start.entity.CityListEntity" parameterType="String">
+        select  CARDTYPE,CITYCODE,CITYNAME,VALIDCOUNT,INVALIDCOUNT,GROUPCOUNT,ROWNUM taskID
+from (select substr(original_no,21,1) cardType ,substr(original_no,0,4)||'00' CITYCODE ,CITY_DIC.CITYNAME,sum(valid_count ) validCount,
+sum(invalid_count) invalidCount,group_COUNT.groupCOUNT
+from acc_group_t@accu_dblink
+inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
+left join (select count(acc_group_t.group_no) groupCOUNT,substr(acc_group_relation_t.original_no,0,4) citycode
+          from acc_group_t@accu_dblink
+          left join acc_group_relation_t@accu_dblink on acc_group_t.group_no = acc_group_relation_t.group_no
+          where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and substr(original_no,21,1) =#{cardType}
+          group by substr(acc_group_relation_t.original_no,0,4)) group_COUNT
+          ON group_COUNT.citycode = substr(original_no,0,4)
+left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on substr(CITY_DIC.CITYCODE,0,4) = substr(original_no,0,4)
+where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and substr(original_no,21,1) =#{cardType}
+group by substr(original_no,21,1), substr(original_no,0,4)||'00', CITY_DIC.CITYNAME, group_COUNT.groupCOUNT)
+    </select>
+
 
     <select id="findStationCountByDealDate" resultType="java.util.HashMap" parameterType="String">
         SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate}  AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}

src/main/resources/static/js/services/service.js

@@ -382,7 +382,6 @@ app.service('MessageService', function (ngDialog) {
                 })
             },
             getTypeListByTaskStateId:function(userState,success){
-			    console.log('----测试查询代码----',userState)
                 $http({
                     method: 'GET',
                     url: "../user/getTypeListByTaskStateId" + urlTimeStamp(),
@@ -396,6 +395,20 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            getTypeListByImportDateAtACCU:function(date,success){
+                $http({
+                    method: 'GET',
+                    url: "../user/getTypeListByImportDateAtACCU" + urlTimeStamp(),
+                    params:{
+                        importTime:date
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
             getCityListByCardType:function(cardType,state,success){
                 $http({
                     method: 'GET',
@@ -411,6 +424,21 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            getCityListByImportDateAtACCU:function(importDate,cardType,success){
+                $http({
+                    method: 'GET',
+                    url: "../user/getCityListByImportDateAtACCU" + urlTimeStamp(),
+                    params:{
+                        importTime:importDate,
+                        cardType:cardType
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
             getGroupNoByTaskListId:function(taskStateId,success){
                 $http({
                     method: 'GET',
@@ -425,6 +453,23 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            getGroupListAtACCU:function(citycode,cardType,importTime,success){
+                $http({
+                    method: 'GET',
+                    url: "../user/getGroupListAtACCU" + urlTimeStamp(),
+                    params:{
+                        typeCode:cardType,
+                        cityCode:citycode,
+                        importTime:importTime
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
+
             getCountyListByTaskListId:function(taskStateId,success){
                 $http({
                     method: 'GET',
@@ -650,6 +695,22 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            getStateCountInfo:function(submitDate,state,success){
+			    console.log(submitDate,state,"------------submitDate,state,--")
+                $http({
+                    method: 'GET',
+                    url: "../yingxin/getStateCountInfo" + urlTimeStamp(),
+                    params:{
+                        submitDate:submitDate,
+                        state:state
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
 
 		}
 	}])
\ No newline at end of file

src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html

@@ -25,9 +25,9 @@
                 <div class="row" style="padding-top:15px;padding-left:20px;">
                     <span class="col-lg-2">
                         <div class="input-group w-md">
-                            <input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt"
+                            <input id="date" type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt"
                                    is-open="opened" datepicker-options="dateOptions" ng-required="true"
-                                   close-text="Close"/>
+                                   close-text="Close" value="12345678" />
                             <span class="input-group-btn">
                                <button type="button" class="btn btn-default" ng-click="open($event)"><i
                                        class="glyphicon glyphicon-calendar"></i></button>
@@ -57,15 +57,15 @@
                                 <th>状态</th>
                                 <th>操作</th>
                                 </thead>
-                                <tbody ng-repeat="city in cityList| orderBy:citycode:desc">
+                                <tbody ng-repeat="city in cityList| orderBy:citycode">
                                 <tr>
                                     <td>{{city.taskId}}</td>
                                     <td><span class="city"
                                               style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td>
                                     <td>{{city.groupCount}}</td>
-                                    <td>{{city.groupNO}}</td>
-                                    <td>{{city.groupSum}}</td>
-                                    <td>{{city.groupInvailedSum}}</td>
+                                    <td>{{city.groupNo}}</td>
+                                    <td>{{city.validCount}}</td>
+                                    <td>{{city.invalidCount}}</td>
                                     <td>
                                         <span style="padding-left:10px;"
                                               ng-show="city.printer_Id==null">未分配</span>
@@ -73,14 +73,14 @@
                                               ng-show="city.printer_Id!=null">机器<span>{{city.printerId}}</span></span>
                                     </td>
                                     <td>{{city.state}}</td>
-                                    <td ng-if="userState<=4"><a ng-click="showTable(city.taskId)">组号列表</a></td>
+                                    <td ng-if="userState<=4"><a ng-click="showTable(city.citycode,city.taskId)">组号列表</a></td>
                                     <td ng-if="userState>4"><a ng-click="showTableCounty(city.taskId)">区县列表</a></td>
                                     <td><a ng-click="finishClick(city.taskId,userState)">完成</a></td>
                                 </tr>
                                 <tr ng-show="showtable==city.taskId && userState<=4">
                                     <td></td>
-                                    <td colspan="4">
-                                        <table style="font-size:0.9em;color: #000;" class="table">
+                                    <td colspan="6">
+                                        <table style="font-size:0.9em;color: #000;" class="table"  ng-if="userState!=1">
                                             <thead>
                                             <th>组号</th>
                                             <th>合格数量</th>
@@ -89,7 +89,7 @@
                                             <th>特殊证件列表</th>
                                             </thead>
                                             <tbody>
-                                            <tr ng-repeat="group in groupList">
+                                            <tr ng-repeat="group in groupList | orderBy:groupNo">
                                                 <td>{{group.groupNo}}</td>
                                                 <td>{{group.validCount}}</td>
                                                 <td>{{group.invalidCount}}</td>
@@ -98,6 +98,31 @@
                                             </tr>
                                             </tbody>
                                         </table>
+                                        <table style="font-size:0.9em;color: #000;" class="table"  ng-if="userState=1">
+                                            <thead>
+                                            <th>组号</th>
+                                            <th>合格数量</th>
+                                            <th>不合格数量</th>
+                                            <th>入库时间</th>
+                                            <th>操作</th>
+                                            <th>特殊证件数量</th>
+                                            <th>特殊证件列表</th>
+                                            </thead>
+                                            <tbody>
+                                            <tr ng-repeat="group in groupList">
+                                                <td>{{group.GROUP_NO}}</td>
+                                                <td>{{group.VALID_COUNT}}</td>
+                                                <td>{{group.INVALID_COUNT}}</td>
+                                                <td>{{group.IMPORT_TIME}}</td>
+                                                <td ng-if="group.DEAL_FLAG==0">未处理</td>
+                                                <td ng-if="group.DEAL_FLAG==1">一次核验</td>
+                                                <td ng-if="group.DEAL_FLAG==2">二次核验</td>
+                                                <td ng-if="group.DEAL_FLAG==3">核验完成</td>
+                                                <td>{{group.SpecialCardList.length}}</td>
+                                                <td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
                                     </td>
                                 </tr>
 

src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js

@@ -6,8 +6,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
         $state.go("layout.cycleSheet")
     }
     // $scope.userState = $rootScope.loginData.workshop;
-    console.log($scope.userState,'---------$scope.userState-------')
-    $scope.userState=5;
+    $scope.userState=1;
 
     var getNowFormatDate = function () {
         var date = new Date();
@@ -19,7 +18,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
         if (strDate >= 0 && strDate <= 9) {
             strDate = "0" + strDate;
         }
-        var currentdate = date.getFullYear() + "/" + month + "/" + strDate;
+        var currentdate = date.getFullYear() + "-" + month + "-" + strDate;
         return currentdate;
     }
     $scope.today = function () {
@@ -53,23 +52,36 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
         class: 'datepicker'
     };
 
-    $scope.initDate = new Date('2016-15-20');
-    $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
+    $scope.initDate = new Date('20161520');
+    $scope.formats = ['dd-MM-yyyy', 'yyyyMMdd', 'dd.MM.yyyy', 'shortDate'];
     $scope.format = $scope.formats[1];
     $scope.task_click = function () {
+        getTypeListData($scope.userState)
     }
 
     $scope.cardType = 0;
     $scope.check_type = function (typeCode) {
-        cardType = typeCode;
-        getCityListData(cardType,$scope.userState);
+        $scope.cardType = typeCode;
+        getCityListData($scope.cardType,$scope.userState);
     }
-    // 查询制证类型列表
+
+    // $scope.today = new  Date();
+    // $scope.date = $filter('date')($scope.today, 'yyyyMMdd');
+    // 查询制证类型列表submitDate,state,
     var getTypeListData = function (userState) {
-        HttpService.getTypeListByTaskStateId(userState,function (data) {
-            $scope.typeList = data.respData;
+        $scope.date = $("#date").val();
+        console.log($scope.date,"---$scope.date---")
+       if (userState==1){
+           HttpService.getTypeListByImportDateAtACCU($scope.date,function (data) {
+               $scope.typeList = data.respData;
 
-        })
+           })
+       } else {
+           HttpService.getTypeListByTaskStateId(userState,function (data) {
+               $scope.typeList = data.respData;
+
+           })
+       }
     }
     getTypeListData($scope.userState);
     $scope.currentTab = 1;
@@ -96,26 +108,45 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
 
     // 查询城市列表
     var getCityListData = function (cardType,state) {
-        console.log("----调用查询城市列表接口-",cardType,state)
-        HttpService.getCityListByCardType(cardType,state,function (data) {
-            $scope.cityList = data.respData;
-            console.log("---城市列表--数据源:")
-            console.log(data.respData)
+        $scope.date = $("#date").val();
+        if ($scope.userState==1){
+            console.log("==================")
+            HttpService.getCityListByImportDateAtACCU($scope.date,cardType,function (data) {
+                $scope.cityList = data.respData;
+                console.log("---城市列表--数据源:")
+                console.log(data.respData)
+
+            })
+        } else {
+            console.log("-------------------")
+            HttpService.getCityListByCardType(cardType,state,function (data) {
+                $scope.cityList = data.respData;
+                console.log("---城市列表--数据源:")
+                console.log(data.respData)
+
+            })
+        }
 
-        })
     }
     console.log("--查看card type- -",$scope.cardType)
     getCityListData($scope.cardType,$scope.userState);
 
     // 查询组号列表
-    var getGroupListData = function (taskId) {
-        console.log("---查询组号列表--数据源:",taskId);
-        HttpService.getGroupNoByTaskListId(taskId,function (data) {
-            $scope.groupList = data.respData;
-            console.log("---查询组号列表--数据源:")
-            console.log(data.respData)
+    var getGroupListData = function (citycode,taskId) {
+        $scope.date = $("#date").val();
+        if ($scope.userState==1){
+            console.log(citycode,"----------",$scope.cardType,"-----",$scope.date,"-----citycode,$scope.cardType,$scope.date-----")
+            HttpService.getGroupListAtACCU(citycode,$scope.cardType,$scope.date,function (data) {
+
+                $scope.groupList = data.respData;
+                console.log($scope.groupList,"=====组号列表====")
+            })
+        } else {
+            HttpService.getGroupNoByTaskListId(taskId,function (data) {
+                $scope.groupList = data.respData;
+            })
+        }
 
-        })
     }
 
 
@@ -336,14 +367,15 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
     // ]
 
     $scope.showtable = -1;
-    $scope.showTable = function (taskID) {
-        console.log("$scope.-------$scope.showtable----",taskID);
-        if ($scope.showtable != taskID) {
-            $scope.showtable = taskID;
-        } else {
-            $scope.showtable = -1;
-        }
-        getGroupListData($scope.showtable);
+    $scope.showTable = function (cityCode,taskID) {
+
+            if ($scope.showtable != taskID) {
+                $scope.showtable = taskID;
+            } else {
+                $scope.showtable = -1;
+            }
+
+        getGroupListData(cityCode,$scope.showtable);
     }
 
     $scope.showtableCounty = -1;
@@ -354,12 +386,10 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
         } else {
             $scope.showtableCounty = -1;
         }
-        console.log($scope.showtableCounty,"---$scope.showtableCounty--");
         getCountyListData($scope.showtableCounty);
     }
 
     $scope.showTableGroup = function (specialCardList) {
-        console.log("--specialCardList--",specialCardList);
         ngDialog.open({
             template: 'dialogs/specialCardList.html' + urlTimeStamp(),
             width: 800,
@@ -367,15 +397,12 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
             controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService, $rootScope) {
                 $scope.specialCardList = specialCardList;
             }]
-
         })
     }
 
     $scope.finishClick = function (taskId, userState) {
         var state =parseInt(userState);
-        console.log("--userState+1--",state+1);
         HttpService.updateProductionTask(taskId, state+1, function (success) {
-
             //点击确认成功后  再次查询城市列表
             getCityListData(cardType,state+1 );
         })

src/main/resources/static/tpl/layout/layout.html

@@ -43,6 +43,10 @@
                     </span>
                 </div>
             </div>
+            <span style="margin-left: 300px">
+                已完成数量：<span>{{}}</span>
+                未完成数量：<span>{{}}</span>
+            </span>
         </form>
         <!-- / search form -->
 

src/main/resources/static/tpl/layout/layout.js

@@ -20,5 +20,17 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte
 
         $scope.menuList = $rootScope.loginData.roleList[0].permissions;
     }
+    $scope.userState=$rootScope.loginData.workshop;
+    $scope.today = new  Date();
+    $scope.timeString = $filter('date')($scope.today, 'yyyyMMdd');
+    var  getStateCountInfo = function (timeString,userState) {
+        HttpService.getStateCountInfo(timeString,userState, function (data) {
+            $scope.getStateCountInfoData=data.respData
+
+        })
+    }
+    getStateCountInfo($scope.timeString,$scope.userState);
+
+
 
 }])
\ No newline at end of file

src/main/resources/static/tpl/layout/yieldReport/yieldReport.js

@@ -261,6 +261,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
 //TODO
     //财务报表
     var getFinanceReportData = function(start,end,citycode,type){
+        console.log(start,end,citycode,type,"-------start,end,citycode,type--------")
         HttpService.getFinanceReportDatas(start,end,citycode,type,function(data){
             $scope.financeData = data.respData;
             for(var i=0;i<$scope.financeData.length;i++){
@@ -292,7 +293,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
         $scope.$watch('vm.province', function(province) {
             vm.city = null;
         });
-
         getFinanceReportData($scope.month_first,$scope.month_last,"-1","-1")
     }