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

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

@@ -95,6 +95,7 @@ public class UserApi {
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(productionTaskListEntity);
         Map map = new HashMap();
+        System.out.println(yxjsonResponse.toJSONString()+"--------");
 //        map.put("MakeType",productionTaskListEntity);
         return yxjsonResponse.toJSONString();
     }

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

@@ -9,22 +9,12 @@ import java.util.Objects;
 @Entity
 @Table(name = "GROUP_NO", schema = "DAHAI")
 public class GroupNoEntity {
-    private long group_Id;
     private long task_Id;
     private String group_No;
     private long vaild_Count;
     private long invalid_Count;
     private long special_Card_Count;
 
-    @Basic
-    @Column(name = "GROUP_ID", nullable = false, precision = 0)
-    public long getGroup_Id() {
-        return group_Id;
-    }
-
-    public void setGroup_Id(long group_Id) {
-        this.group_Id = group_Id;
-    }
     @Basic
     @Column(name = "TASK_ID", nullable = false, precision = 0)
     public long getTask_Id() {
@@ -72,11 +62,10 @@ public class GroupNoEntity {
     }
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) { return true;}
+        if (o == null || getClass() != o.getClass()){ return false;}
         GroupNoEntity that = (GroupNoEntity) o;
-        return group_Id == that.group_Id &&
-                vaild_Count == that.vaild_Count &&
+        return vaild_Count == that.vaild_Count &&
                 invalid_Count == that.invalid_Count &&
                 special_Card_Count == that.special_Card_Count &&
                 task_Id == that.task_Id &&
@@ -85,6 +74,6 @@ public class GroupNoEntity {
 
     @Override
     public int hashCode() {
-        return Objects.hash(group_Id, group_No, task_Id, vaild_Count, invalid_Count,special_Card_Count);
+        return Objects.hash( group_No, task_Id, vaild_Count, invalid_Count,special_Card_Count);
     }
 }

src/main/resources/mapper/GroupNoMapper.xml

@@ -2,9 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxproject.start.mapper.GroupNoMapper">
     <resultMap id="GroupNoMapper" type="com.yxproject.start.entity.GroupNoEntity">
-        <id column="GROUP_ID" property="group_Id"  jdbcType="NUMERIC"/>
+        <id column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/>
         <result column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/>
-        <result column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/>
         <result column="VAILD_COUNT" property="vaild_Count"  jdbcType="NUMERIC"/>
         <result column="INVALID_COUNT" property="invalid_Count"  jdbcType="NUMERIC"/>
         <result column="SPECIAL_CARD_COUNT" property="special_Card_Count"  jdbcType="NUMERIC"/>
@@ -15,8 +14,8 @@
     </select>
 
     <insert id="insertGroupNoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
-    Insert into GROUP_NO (GROUP_ID,GROUP_NO,task_Id,VAILD_COUNT,INVALID_COUNT,special_Card_Count) values
-        (#{group_Id},#{group_No},#{task_Id},#{vaild_Count},#{invalid_Count},#{special_Card_Count})
+    Insert into GROUP_NO (GROUP_NO,task_Id,VAILD_COUNT,INVALID_COUNT,special_Card_Count) values
+        (#{group_No},#{task_Id},#{vaild_Count},#{invalid_Count},#{special_Card_Count})
     </insert>
 
     <select id="findGroupNoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
@@ -24,13 +23,12 @@
     </select>
 
     <update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
-        update GROUP_NO set GROUP_ID=#{group_Id}
-        <if test="group_No">,group_No =#{group_No}</if>
+        update GROUP_NO set group_No =#{group_No}
         <if test="task_Id">,task_Id =#{task_Id}</if>
         <if test="vaild_Count">,vaild_Count =#{vaild_Count}</if>
         <if test="invalid_Count">,invalid_Count =#{invalid_Count}</if>
         <if test="special_Card_Count">,special_Card_Count =#{special_Card_Count}</if>
-        where GROUP_ID=#{group_Id}
+        where group_No=#{group_No}
     </update>
 
     <select id="findGroupNoCountByTaskId" parameterType="String" resultType="int">

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

@@ -54,7 +54,42 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
     $scope.initDate = new Date('2016-15-20');
     $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
     $scope.format = $scope.formats[1];
+    $scope.task_click = function(){
+        console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"====");
+    }
+    $scope.check_type = function(typeCode){
+        console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"====",typeCode,"+++++++++++++");
+    }
+    $scope.typeList =[
+        {typeCode:0,typeCount:5000,typeName:'普通证'},
+        {typeCode:1,typeCount:5000,typeName:'邮寄证'},
+        {typeCode:2,typeCount:5000,typeName:'特殊证'},
+        {typeCode:9,typeCount:5000,typeName:'异地证'},
+    ]
+    $scope.cityList =[
+        {"card_Type":1,"citycode":"410300",cityName:"郑州",groupCount:10,groupSum:1500,groupInvailedSum:15,groupNO:"1-25","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811203,"task_State_Id":1},
+        {"card_Type":1,"citycode":"410400",cityName:"驻马店",groupCount:10,groupSum:2500,groupInvailedSum:16,groupNO:"26-45","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811203,"task_State_Id":1},
+        {"card_Type":1,"citycode":"410500",cityName:"新乡",groupCount:10,groupSum:3500,groupInvailedSum:17,groupNO:"46","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811203,"task_State_Id":1},
+        {"card_Type":1,"citycode":"410600",cityName:"周口",groupCount:10,groupSum:3500,groupInvailedSum:18,groupNO:"48-52,53-55","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811203,"task_State_Id":1},
+    ]
+
+    $scope.groupList =[
+        {"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]},
+        {"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]},
+        {"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]}
+         ]
+    $scope.countyList = [
+        {}
+    ]
 
+    $scope.showtable = -1;
+    $scope.showTableDY = function (taskID) {
+        if ($scope.showtable != taskID) {
+            $scope.showtable = taskID;
+        } else {
+            $scope.showtable = -1;
+        }
+    }
 
     $scope.folds = [
         {id:1,name: '普通证', count:10000,filter:'',isActive:true, dataTable:{