Skip to content

Y
YX_IDENT_REFACTORING
Commit 51213b5f authored by Administrator's avatar Administrator
Browse files
Options

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

parents d65c69bc b0884e93
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 111 deletions
src/main/java/com/yxproject/start/api/UserApi.java
View file @ 51213b5f
...@@ -95,6 +95,7 @@ public class UserApi { ...@@ -95,6 +95,7 @@ public class UserApi {
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(productionTaskListEntity); yxjsonResponse.outPutSuccess(productionTaskListEntity);
Map map = new HashMap(); Map map = new HashMap();
System.out.println(yxjsonResponse.toJSONString()+"--------");
// map.put("MakeType",productionTaskListEntity); // map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
......
src/main/java/com/yxproject/start/entity/GroupNoEntity.java
View file @ 51213b5f
...@@ -9,22 +9,12 @@ import java.util.Objects; ...@@ -9,22 +9,12 @@ import java.util.Objects;
@Entity @Entity
@Table(name = "GROUP_NO", schema = "DAHAI") @Table(name = "GROUP_NO", schema = "DAHAI")
public class GroupNoEntity { public class GroupNoEntity {
private long group_Id;
private long task_Id; private long task_Id;
private String group_No; private String group_No;
private long vaild_Count; private long vaild_Count;
private long invalid_Count; private long invalid_Count;
private long special_Card_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 @Basic
@Column(name = "TASK_ID", nullable = false, precision = 0) @Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTask_Id() { public long getTask_Id() {
...@@ -72,11 +62,10 @@ public class GroupNoEntity { ...@@ -72,11 +62,10 @@ public class GroupNoEntity {
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) { return true;}
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()){ return false;}
GroupNoEntity that = (GroupNoEntity) o; GroupNoEntity that = (GroupNoEntity) o;
return group_Id == that.group_Id && return vaild_Count == that.vaild_Count &&
vaild_Count == that.vaild_Count &&
invalid_Count == that.invalid_Count && invalid_Count == that.invalid_Count &&
special_Card_Count == that.special_Card_Count && special_Card_Count == that.special_Card_Count &&
task_Id == that.task_Id && task_Id == that.task_Id &&
...@@ -85,6 +74,6 @@ public class GroupNoEntity { ...@@ -85,6 +74,6 @@ public class GroupNoEntity {
@Override @Override
public int hashCode() { 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
View file @ 51213b5f
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!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"> <mapper namespace="com.yxproject.start.mapper.GroupNoMapper">
<resultMap id="GroupNoMapper" type="com.yxproject.start.entity.GroupNoEntity"> <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="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="VAILD_COUNT" property="vaild_Count" jdbcType="NUMERIC"/>
<result column="INVALID_COUNT" property="invalid_Count" jdbcType="NUMERIC"/> <result column="INVALID_COUNT" property="invalid_Count" jdbcType="NUMERIC"/>
<result column="SPECIAL_CARD_COUNT" property="special_Card_Count" jdbcType="NUMERIC"/> <result column="SPECIAL_CARD_COUNT" property="special_Card_Count" jdbcType="NUMERIC"/>
...@@ -15,8 +14,8 @@ ...@@ -15,8 +14,8 @@
</select> </select>
<insert id="insertGroupNoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity"> <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 Insert into GROUP_NO (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}) (#{group_No},#{task_Id},#{vaild_Count},#{invalid_Count},#{special_Card_Count})
</insert> </insert>
<select id="findGroupNoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String"> <select id="findGroupNoEntityByAcceptNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
...@@ -24,13 +23,12 @@ ...@@ -24,13 +23,12 @@
</select> </select>
<update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity"> <update id="updateGroupinfoEntity" parameterType="com.yxproject.start.entity.GroupNoEntity">
update GROUP_NO set GROUP_ID=#{group_Id} update GROUP_NO set group_No =#{group_No}
<if test="group_No">,group_No =#{group_No}</if>
<if test="task_Id">,task_Id =#{task_Id}</if> <if test="task_Id">,task_Id =#{task_Id}</if>
<if test="vaild_Count">,vaild_Count =#{vaild_Count}</if> <if test="vaild_Count">,vaild_Count =#{vaild_Count}</if>
<if test="invalid_Count">,invalid_Count =#{invalid_Count}</if> <if test="invalid_Count">,invalid_Count =#{invalid_Count}</if>
<if test="special_Card_Count">,special_Card_Count =#{special_Card_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> </update>
<select id="findGroupNoCountByTaskId" parameterType="String" resultType="int"> <select id="findGroupNoCountByTaskId" parameterType="String" resultType="int">
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @ 51213b5f
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }"> <div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;"> <div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div class="hbox hbox-auto-xs hbox-auto-sm"> <div class="hbox hbox-auto-xs hbox-auto-sm">
<div class="col w-md bg-light dk b-r bg-auto"> <div class="col w-md bg-light dk b-r bg-auto">
<div class="wrapper b-b bg"> <div class="wrapper b-b bg">
<button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show" target="#email-menu"><i class="fa fa-bars"></i></button> <button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show"
<a class="w-xs font-bold">任务循环单</a> target="#email-menu"><i class="fa fa-bars"></i></button>
<a class="w-xs font-bold">任务循环单</a>
</div> </div>
<div class="wrapper hidden-sm hidden-xs" id="email-menu"> <div class="wrapper hidden-sm hidden-xs" id="email-menu">
<ul class="nav nav-pills nav-stacked nav-sm"> <ul class="nav nav-pills nav-stacked nav-sm">
<li ng-repeat="fold in folds" ui-sref-active="active" ng-class="{true: 'active', false: ''}[fold.isActive]" > <li ng-repeat="type in typeList" ui-sref-active="active"
<a ng-click="func(fold.id)"> ng-class="{true: 'active', false: ''}[type.isActive]">
{{fold.name}}({{fold.count}}) <a ng-click="check_type(type.typeCode)">
{{type.typeName}}({{type.typeCount}})
</a> </a>
</li> </li>
</ul> </ul>
...@@ -22,110 +25,84 @@ ...@@ -22,110 +25,84 @@
<div class="row" style="padding-top:15px;padding-left:20px;"> <div class="row" style="padding-top:15px;padding-left:20px;">
<span class="col-lg-2"> <span class="col-lg-2">
<div class="input-group w-md"> <div class="input-group w-md">
<input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt" is-open="opened" datepicker-options="dateOptions" ng-required="true" close-text="Close" /> <input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt"
is-open="opened" datepicker-options="dateOptions" ng-required="true"
close-text="Close"/>
<span class="input-group-btn"> <span class="input-group-btn">
<button type="button" class="btn btn-default" ng-click="open($event)"><i class="glyphicon glyphicon-calendar"></i></button> <button type="button" class="btn btn-default" ng-click="open($event)"><i
class="glyphicon glyphicon-calendar"></i></button>
</span> </span>
</div> </div>
</span> </span>
<span class="col-lg-1"> <span class="col-lg-1" style="margin-left: 1em">
<button type="button" class="btn btn-primary" ng-click="">查询</button> <button type="button" class="btn btn-primary" ng-click="task_click()">查询</button>
</span> </span>
</div> </div>
<!-- / header --> <!-- / header -->
<div class="wrapper-md"> <div class="wrapper-md">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Responsive Table 制证任务
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped b-t b-light"> <table class="table table-striped b-t b-light">
<thead> <thead>
<tr> <th>循环单编号</th>
<th style="width:20px;"> <th>地市</th>
<label class="i-checks m-b-none"> <th>组数</th>
<input type="checkbox"><i></i> <th>组号</th>
</label> <th>数据核验</th>
</th> <th>不合格</th>
<th>Project</th> <th>机器号</th>
<th>Task</th> <th>状态</th>
<th>Date</th> <th></th>
<th style="width:30px;"></th>
</tr>
</thead> </thead>
<tbody> <tbody ng-repeat="city in cityList| orderBy:citycode:desc">
<tr>
<td><label class="i-checks m-b-none"><input type="checkbox" name="post[]"><i></i></label></td>
<td>Idrawfast</td>
<td>4c</td>
<td>Jul 25, 2013</td>
<td>
<a href class="active" ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a>
</td>
</tr>
<tr>
<td><label class="i-checks m-b-none"><input type="checkbox" name="post[]"><i></i></label></td>
<td>Formasa</td>
<td>8c</td>
<td>Jul 22, 2013</td>
<td>
<a href ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a>
</td>
</tr>
<tr>
<td><label class="i-checks m-b-none"><input type="checkbox" name="post[]"><i></i></label></td>
<td>Avatar system</td>
<td>15c</td>
<td>Jul 15, 2013</td>
<td>
<a href class="active" ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a>
</td>
</tr>
<tr>
<td><label class="i-checks m-b-none"><input type="checkbox" name="post[]"><i></i></label></td>
<td>Throwdown</td>
<td>4c</td>
<td>Jul 11, 2013</td>
<td>
<a href class="active" ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a>
</td>
</tr>
<tr> <tr>
<td><label class="i-checks m-b-none"><input type="checkbox" name="post[]"><i></i></label></td> <td>{{city.task_Id}}</td>
<td>Idrawfast</td> <td><span class="city"
<td>4c</td> style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td>
<td>Jul 7, 2013</td> <td>{{city.groupCount}}</td>
<td>{{city.groupNO}}</td>
<td>{{city.groupSum}}</td>
<td>{{city.groupInvailedSum}}</td>
<td> <td>
<a href class="active" ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a> <span style="padding-left:10px;"
ng-show="city.printer_Id==null">未分配</span>
<span style="padding-left:10px;"
ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span>
</td> </td>
<td>{{city.state}}</td>
<td><a ng-click="showTable(city.task_Id)">组号列表</a></td>
</tr> </tr>
<tr> <tr ng-show="showtable==city.task_Id">
<td><label class="i-checks m-b-none"><input type="checkbox" name="post[]"><i></i></label></td> <td></td>
<td>Formasa</td> <td colspan="4">
<td>8c</td> <table style="font-size:0.9em;color: #000;" class="table">
<td>Jul 3, 2013</td> <thead>
<td> <th>组号</th>
<a href class="active" ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a> <th>合格数量</th>
</td> <th>不合格数量</th>
</tr> <th></th>
<tr> </thead>
<td><label class="i-checks m-b-none"><input type="checkbox" name="post[]"><i></i></label></td> <tbody>
<td>Avatar system</td> <tr ng-repeat="groups in city.list">
<td>15c</td> <td>{{groups.groupNo}}</td>
<td>Jul 2, 2013</td> <td>{{groups.downloadCount}}</td>
<td> <td>{{groups.type}}</td>
<a href class="active" ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a> <td></td>
</td> </tr>
</tr> </tbody>
<tr> </table>
<td><label class="i-checks m-b-none"><input type="checkbox" name="post[]"><i></i></label></td>
<td>Videodown</td>
<td>4c</td>
<td>Jul 1, 2013</td>
<td>
<a href class="active" ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a>
</td> </td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
View file @ 51213b5f
...@@ -54,7 +54,42 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi ...@@ -54,7 +54,42 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
$scope.initDate = new Date('2016-15-20'); $scope.initDate = new Date('2016-15-20');
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate']; $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1]; $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 = [ $scope.folds = [
{id:1,name: '普通证', count:10000,filter:'',isActive:true, dataTable:{ {id:1,name: '普通证', count:10000,filter:'',isActive:true, dataTable:{
......
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