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

# Conflicts:
#	src/main/resources/mapper/GroupNoMapper.xml

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

@@ -11,7 +11,7 @@ import java.util.Objects;
 public class GroupNoEntity {
     private long task_Id;
     private String group_No;
-    private long vaild_Count;
+    private long valid_Count;
     private long invalid_Count;
     private long special_Card_Count;
 
@@ -34,13 +34,13 @@ public class GroupNoEntity {
         this.group_No = group_No;
     }
     @Basic
-    @Column(name = "VAILD_COUNT", nullable = false, precision = 0)
-    public long getVaild_Count() {
-        return vaild_Count;
+    @Column(name = "VALID_COUNT", nullable = false, precision = 0)
+    public long getValid_Count() {
+        return valid_Count;
     }
 
-    public void setVaild_Count(long vaild_Count) {
-        this.vaild_Count = vaild_Count;
+    public void setValid_Count(long valid_Count) {
+        this.valid_Count = valid_Count;
     }
     @Basic
     @Column(name = "INVALID_COUNT", nullable = false, precision = 0)
@@ -65,7 +65,7 @@ public class GroupNoEntity {
         if (this == o) { return true;}
         if (o == null || getClass() != o.getClass()){ return false;}
         GroupNoEntity that = (GroupNoEntity) o;
-        return vaild_Count == that.vaild_Count &&
+        return valid_Count == that.valid_Count &&
                 invalid_Count == that.invalid_Count &&
                 special_Card_Count == that.special_Card_Count &&
                 task_Id == that.task_Id &&
@@ -74,6 +74,6 @@ public class GroupNoEntity {
 
     @Override
     public int hashCode() {
-        return Objects.hash( group_No, task_Id, vaild_Count, invalid_Count,special_Card_Count);
+        return Objects.hash( group_No, task_Id, valid_Count, invalid_Count,special_Card_Count);
     }
 }

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

@@ -209,7 +209,7 @@ public class TaskServiceImpl implements TaskService {
                 groupNoEntity1.setTask_Id(taskEntity.getTask_Id());
                 groupNoEntity1.setGroup_No(group_no.toString());
                 groupNoEntity1.setInvalid_Count(Long.valueOf(invalid_count.toString()));
-                groupNoEntity1.setVaild_Count(Long.valueOf(valid_count.toString()));
+                groupNoEntity1.setValid_Count(Long.valueOf(valid_count.toString()));
                 groupNoEntity1.setSpecial_Card_Count((long) 1);
                 groupNoMapper.insertGroupNoEntity(groupNoEntity1);
 

src/main/resources/mapper/GroupNoMapper.xml

@@ -4,7 +4,7 @@
     <resultMap id="GroupNoMapper" type="com.yxproject.start.entity.GroupNoEntity">
         <id column="GROUP_NO" property="group_No" jdbcType="VARCHAR"/>
         <result column="TASK_ID" property="task_Id" jdbcType="NUMERIC"/>
-        <result column="VAILD_COUNT" property="vaild_Count"  jdbcType="NUMERIC"/>
+        <result column="VALID_COUNT" property="valid_Count"  jdbcType="NUMERIC"/>
         <result column="INVALID_COUNT" property="invalid_Count"  jdbcType="NUMERIC"/>
         <result column="SPECIAL_CARD_COUNT" property="special_Card_Count"  jdbcType="NUMERIC"/>
     </resultMap>
@@ -14,8 +14,8 @@
     </select>
 
     <insert id="insertGroupNoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
-    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 into GROUP_NO (GROUP_NO,task_Id,VALID_COUNT,INVALID_COUNT,special_Card_Count) values
+        (#{group_No},#{task_Id},#{valid_Count},#{invalid_Count},#{special_Card_Count})
     </insert>
 
     <select id="findGroupNoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
@@ -25,7 +25,7 @@
     <update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
         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="valid_Count">,valid_Count =#{valid_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_No=#{group_No}

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

@@ -122,7 +122,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
         {typeCode: 0, typeCount: 5000, typeName: '普通证'},
         {typeCode: 1, typeCount: 5000, typeName: '邮寄证'},
         {typeCode: 2, typeCount: 5000, typeName: '特殊证'},
-        {typeCode: 9, typeCount: 5000, typeName: '异地证'},
+        {typeCode: 9, typeCount: 5000, typeName: '异地证'}
     ]
     $scope.cityList = [
         {
@@ -324,6 +324,8 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
         }
     ]
 
+    $scope.receiptList = [[358, 0, 0, 0, 82, 0, 0, 1, 0, 205, 646, 3, "郑州 辖区", "410101"], [721, 0, 0, 0, 20, 0, 0, 7, 1, 91, 840, 4, "郑州  中原", "410102"],]
+
     $scope.showtable = -1;
     $scope.showTable = function (taskID) {
         if ($scope.showtable != taskID) {