Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 7fe3f10a authored by liuxinben's avatar liuxinben
Browse files
Options

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

parents 57b73991 65e03dbd
Show whitespace changes
Inline Side-by-side
Showing with 229 additions and 125 deletions
src/main/java/com/yxproject/start/api/MaterialManagementApi.java
View file @ 7fe3f10a
......@@ -26,8 +26,8 @@ public class MaterialManagementApi {
* @return
*/
@RequestMapping("insertFilm")
public boolean insertFilm(@Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note, @Param("name")String name){
boolean result = materialManagementService.insertFilm(totalCount, plasticFilmType, note,name);
public boolean insertFilm(@Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note, @Param("name")String name,@Param("state")String state){
boolean result = materialManagementService.insertFilm(totalCount, plasticFilmType, note,name,Long.valueOf(state));
return result;
}
......@@ -39,8 +39,8 @@ public class MaterialManagementApi {
* @return
*/
@RequestMapping("insertCardBody")
public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name, @Param("cardBodyType")String cardBodyType){
boolean result = materialManagementService.insertCardBody(cardType, totalCount, note,name,cardBodyType);
public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name, @Param("cardBodyType")String cardBodyType,@Param("state")String state){
boolean result = materialManagementService.insertCardBody(cardType, totalCount, note,name,cardBodyType,Long.valueOf(state));
return result;
}
......@@ -108,6 +108,47 @@ public class MaterialManagementApi {
}
/**
* 更新卡体详情状态
* @param id cardBodyID
* @return
*/
@RequestMapping("updateCardBody")
public boolean updateCardBody(@Param("id")String id){
return materialManagementService.updateCardBodyState(Long.valueOf(id));
}
/**
* 查询未审核卡体详情
*/
@RequestMapping("selectCardBody")
public List<CardBodyEntity> selectCardBody(){
return materialManagementService.selectCardBody();
}
/**
* 更新膜详情状态
* @param id cardBodyID
* @return
*/
@RequestMapping("updatePlasticFilm")
public boolean updatePlasticFilm(@Param("id")String id){
return materialManagementService.updatePlasticFilm(Long.valueOf(id));
}
/**
* 查询未审核膜详情
*/
@RequestMapping("selectPlasticFilm")
public List<PlasticFilmEntity> selectPlasticFilm(){
return materialManagementService.selectPlasticFilm();
}
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ 7fe3f10a
......@@ -307,7 +307,7 @@ public class ReceiptApi {
*/
@RequestMapping("queryReceiptDateByCheckDate")
public List<Map<String, Object>> queryReceiptDateByCheckDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate) {
return receiptService.selectReceiptDateByCheckDate(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", "")),replaceDate(endDate.replaceAll(" ", "").replaceAll(":", "")));
return receiptService.selectReceiptDateByCheckDate(replaceNullString(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", ""))),replaceNullString(replaceDate(endDate.replaceAll(" ", "").replaceAll(":", ""))));
}
......
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 7fe3f10a
......@@ -241,7 +241,6 @@ public class TaskListApi {
@RequestMapping("createTask")
@Transactional
public Map<String, Object> queryByCountyAtACCU(@RequestBody String str, HttpServletResponse resp) {
System.out.println(str);
JSONObject jsonObject = JSONObject.fromObject(str);
String name = jsonObject.getString("name");
JSONArray jsonGroup = jsonObject.getJSONArray("groupList");
......
src/main/java/com/yxproject/start/entity/CardBodyEntity.java
View file @ 7fe3f10a
......@@ -2,23 +2,23 @@ package com.yxproject.start.entity;
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
import java.util.Objects;
/**
* @auther zhangyusheng
* 2019/4/1 15:03
* 2019/4/28 15:12
*/
@Entity
@Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "")
public class CardBodyEntity {
private long cardBodyId;
private Date saveDate;
private Time saveDate;
private Long cardType;
private Long totalCount;
private String note;
private String name;
private Long cardBodyType;
private String name;
private long state;
@Id
@Column(name = "CARD_BODY_ID")
......@@ -32,11 +32,11 @@ public class CardBodyEntity {
@Basic
@Column(name = "SAVE_DATE")
public Date getSaveDate() {
public Time getSaveDate() {
return saveDate;
}
public void setSaveDate(Date saveDate) {
public void setSaveDate(Time saveDate) {
this.saveDate = saveDate;
}
......@@ -70,6 +70,16 @@ public class CardBodyEntity {
this.note = note;
}
@Basic
@Column(name = "CARD_BODY_TYPE")
public Long getCardBodyType() {
return cardBodyType;
}
public void setCardBodyType(Long cardBodyType) {
this.cardBodyType = cardBodyType;
}
@Basic
@Column(name = "NAME")
public String getName() {
......@@ -80,12 +90,23 @@ public class CardBodyEntity {
this.name = name;
}
@Basic
@Column(name = "STATE")
public long getState() {
return state;
}
public void setState(long state) {
this.state = state;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CardBodyEntity that = (CardBodyEntity) o;
return cardBodyId == that.cardBodyId &&
state == that.state &&
Objects.equals(saveDate, that.saveDate) &&
Objects.equals(cardType, that.cardType) &&
Objects.equals(totalCount, that.totalCount) &&
......@@ -96,16 +117,6 @@ public class CardBodyEntity {
@Override
public int hashCode() {
return Objects.hash(cardBodyId, saveDate, cardBodyType,cardType, totalCount, note, name);
}
@Basic
@Column(name = "CARD_BODY_TYPE")
public Long getCardBodyType() {
return cardBodyType;
}
public void setCardBodyType(Long cardBodyType) {
this.cardBodyType = cardBodyType;
return Objects.hash(cardBodyId, saveDate, cardType, totalCount, note, cardBodyType, name, state);
}
}
src/main/java/com/yxproject/start/entity/PlasticFilmEntity.java
View file @ 7fe3f10a
......@@ -6,17 +6,18 @@ import java.util.Objects;
/**
* @auther zhangyusheng
* 2019/4/1 15:04
* 2019/4/28 15:12
*/
@Entity
@Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "")
public class PlasticFilmEntity {
private long plasticFilmId;
private String saveDate;
private Time saveDate;
private Long totalCount;
private Long plasticFilmType;
private String note;
private String name;
private long state;
@Id
@Column(name = "PLASTIC_FILM_ID")
......@@ -30,11 +31,11 @@ public class PlasticFilmEntity {
@Basic
@Column(name = "SAVE_DATE")
public String getSaveDate() {
public Time getSaveDate() {
return saveDate;
}
public void setSaveDate(String saveDate) {
public void setSaveDate(Time saveDate) {
this.saveDate = saveDate;
}
......@@ -78,12 +79,23 @@ public class PlasticFilmEntity {
this.name = name;
}
@Basic
@Column(name = "STATE")
public long getState() {
return state;
}
public void setState(long state) {
this.state = state;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PlasticFilmEntity that = (PlasticFilmEntity) o;
return plasticFilmId == that.plasticFilmId &&
state == that.state &&
Objects.equals(saveDate, that.saveDate) &&
Objects.equals(totalCount, that.totalCount) &&
Objects.equals(plasticFilmType, that.plasticFilmType) &&
......@@ -93,6 +105,6 @@ public class PlasticFilmEntity {
@Override
public int hashCode() {
return Objects.hash(plasticFilmId, saveDate, totalCount, plasticFilmType, note, name);
return Objects.hash(plasticFilmId, saveDate, totalCount, plasticFilmType, note, name, state);
}
}
src/main/java/com/yxproject/start/mapper/DataAuditingMapper.java
View file @ 7fe3f10a
......@@ -18,9 +18,9 @@ public interface DataAuditingMapper {
public boolean saveDataAuditingEntity(DataAuditingEntity dataAuditingEntity);
@Select("select substr(UPLOAD_NO,0,6)||'000' POLICE_SUBSTATION ,count(UPLOAD_NO) count from ACC_CARD_T@ACCU_LINK \n" +
@Select("select substr(UPLOAD_NO,0,9) POLICE_SUBSTATION ,count(UPLOAD_NO) count from ACC_CARD_T@ACCU_LINK \n" +
"where ACCEPT_NO not in (select ACCEPT_NO from ACC_ERROR_INFO_T@ACCU_LINK) and substr(ACCEPT_NO,0,8) in (#{groupNo})\n" +
"group by substr(UPLOAD_NO,0,6)")
"group by substr(UPLOAD_NO,0,9)")
public List<Map<String,Object>> selectDataAuditingEntity(@Param("groupNo")String groupNo);
@Select("select DATA_AUDITING.POLICE_SUBSTATION,sum(count),GAJG_DM.GAJG_MC from DATA_AUDITING \n" +
......
src/main/java/com/yxproject/start/mapper/MaterialManagementMapper.java
View file @ 7fe3f10a
......@@ -2,19 +2,14 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.CardBodyEntity;
import com.yxproject.start.entity.PlasticFilmEntity;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Mapper
public interface MaterialManagementMapper {
@Insert("INSERT INTO PLASTIC_FILM (TOTAL_COUNT,PLASTIC_FILM_TYPE,NOTE,name)VALUES(#{totalCount},#{plasticFilmType},#{note},#{name})")
public boolean insertFilm(@Param("totalCount") String totalCount, @Param("plasticFilmType") String plasticFilmType, @Param("note") String note, @Param("name") String name);
@Insert("INSERT INTO PLASTIC_FILM (TOTAL_COUNT,PLASTIC_FILM_TYPE,NOTE,name,state) VALUES(#{totalCount},#{plasticFilmType},#{note},#{name},#{state})")
public boolean insertFilm(@Param("totalCount") String totalCount, @Param("plasticFilmType") String plasticFilmType, @Param("note") String note, @Param("name") String name, @Param("state") long state);
@Select("<script>" +
"select * from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate}" +
......@@ -50,8 +45,8 @@ public interface MaterialManagementMapper {
public String selectFilmCount2(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
@Insert("INSERT INTO CARD_BODY (CARD_TYPE,TOTAL_COUNT,NOTE,name,CARD_BODY_TYPE)VALUES(#{cardType},#{totalCount},#{note},#{name},#{cardBodyType})")
public boolean insertCardBody(@Param("cardType") String cardType, @Param("totalCount") String totalCount, @Param("note") String note, @Param("name") String name, @Param("cardBodyType") long cardBodyType);
@Insert("INSERT INTO CARD_BODY (CARD_TYPE,TOTAL_COUNT,NOTE,name,CARD_BODY_TYPE,state)VALUES(#{cardType},#{totalCount},#{note},#{name},#{cardBodyType},#{state})")
public boolean insertCardBody(@Param("cardType") String cardType, @Param("totalCount") String totalCount, @Param("note") String note, @Param("name") String name, @Param("cardBodyType") long cardBodyType, @Param("state") long state);
@Select("<script>" +
......@@ -66,7 +61,7 @@ public interface MaterialManagementMapper {
" and card_Body_Type =#{cardBodyType} " +
"</if>" +
"</script>")
public List<CardBodyEntity> selectCardBody(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name,@Param("cardBodyType")String cardBodyType);
public List<CardBodyEntity> selectCardBody(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name, @Param("cardBodyType")String cardBodyType);
@Select("<script>" +
"select sum(TOTAL_COUNT) cardType1 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=1" +
......@@ -90,4 +85,15 @@ public interface MaterialManagementMapper {
"</script>")
public String selectCardCount2(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
@Select("select * from card_body where state = 0")
public List<CardBodyEntity> selectCardBodyByState();
@Select("select * from Plastic_Film where state = 0")
public List<PlasticFilmEntity> selectPlasticFilmByState();
@Update("update card_body set state =1 where CARD_BODY_ID = #{id}")
public boolean updateCardBodyState(long id);
@Update("update PLASTIC_FILM set state =1 where PLASTIC_FILM_ID = #{id}")
public boolean updatePlasticFilmState(long id);
}
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ 7fe3f10a
......@@ -193,16 +193,18 @@ public interface ReceiptMapper {
"WHERE ACCEPT_NO=#{groupNo}")
public Map<String,Object> selectTimes(@Param("groupNo") String groupNo);
@Select("select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
@Select("<script>" +
"select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
"RECEIPT_LIST.FINISH_COUNT,GAJG_DM.GAJG_DM,GAJG_DM.GAJG_MC,RECEIPT_LIST.CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
",CARD_TYPE_DIC.CARD_TYPE,COUNTY_DIC.COUNTY_CODE ,COUNTY_DIC.COUNTYNAME,RECEIPT_LIST.state,RECEIPT_LIST.IS_PRINT from RECEIPT_LIST \n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
"left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
" where receipt_date is null " +
"<if test ='startDate !=null'> " +
"<if test ='startDate != null'> " +
"and to_char(CHECK_DATE,'yyyyMMddhhmmss') BETWEEN ${startDate} and ${endDate} " +
"</if> " +
"</if>" +
"</script> " +
"")
public List<Map<String,Object>> selectReceiptDateByCheckDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
......
src/main/java/com/yxproject/start/service/MaterialManagementService.java
View file @ 7fe3f10a
......@@ -4,19 +4,17 @@ import com.yxproject.start.entity.CardBodyEntity;
import com.yxproject.start.entity.PlasticFilmEntity;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
import java.util.Map;
public interface MaterialManagementService {
public boolean insertFilm( @Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note,String name);
public boolean insertFilm( @Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note,String name,long state);
public List<PlasticFilmEntity> selectFilm(@Param("beginDate") String beginDate, @Param("endDate")String endDate,String typeCode, String name);
public List<PlasticFilmEntity> selectFilm(@Param("beginDate") String beginDate, @Param("endDate")String endDate, String typeCode, String name);
public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, String name,String cardBodyType);
public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, String name,String cardBodyType,long state);
public List<CardBodyEntity> selectCardBody(@Param("beginDate")String beginDate, @Param("endDate")String endDate,String typeCode, String name,String cardBodyType);
public List<CardBodyEntity> selectCardBody(@Param("beginDate")String beginDate, @Param("endDate")String endDate, String typeCode, String name, String cardBodyType);
public String selectFilmCount1(@Param("beginDate") String beginDate,@Param("endDate")String endDate,String typeCode, String name);
......@@ -26,5 +24,12 @@ public interface MaterialManagementService {
public String selectCardCount2(@Param("beginDate")String beginDate,@Param("endDate")String endDate,String typeCode, String name);
public boolean updateCardBodyState(long id);
public List<CardBodyEntity> selectCardBody();
public boolean updatePlasticFilm(long id);
public List<PlasticFilmEntity> selectPlasticFilm();
}
src/main/java/com/yxproject/start/service/impl/MaterialManagementServiceImpl.java
View file @ 7fe3f10a
......@@ -7,34 +7,32 @@ import com.yxproject.start.service.MaterialManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service
public class MaterialManagementServiceImpl implements MaterialManagementService {
@Autowired
private MaterialManagementMapper materialManagementMapper;
@Override
public boolean insertFilm( String totalCount, String plasticFilmType, String note,String name) {
materialManagementMapper.insertFilm(totalCount,plasticFilmType,note,name);
public boolean insertFilm( String totalCount, String plasticFilmType, String note,String name,long state) {
materialManagementMapper.insertFilm(totalCount,plasticFilmType,note,name,state);
return true;
}
@Override
public List<PlasticFilmEntity> selectFilm(String beginDate, String endDate,String typeCode, String name) {
public List<PlasticFilmEntity> selectFilm(String beginDate, String endDate, String typeCode, String name) {
List<PlasticFilmEntity> resultList = materialManagementMapper.selectFilm(beginDate, endDate,typeCode,name);
return resultList;
}
@Override
public boolean insertCardBody( String cardType, String totalCount, String note,String name,String cardBodyType) {
materialManagementMapper.insertCardBody(cardType,totalCount,note,name,Long.valueOf(cardBodyType));
public boolean insertCardBody( String cardType, String totalCount, String note,String name,String cardBodyType,long state) {
materialManagementMapper.insertCardBody(cardType,totalCount,note,name,Long.valueOf(cardBodyType),state);
return true;
}
@Override
public List<CardBodyEntity> selectCardBody(String beginDate, String endDate,String typeCode, String name,String cardBodyType) {
public List<CardBodyEntity> selectCardBody(String beginDate, String endDate, String typeCode, String name, String cardBodyType) {
List<CardBodyEntity> resultList = materialManagementMapper.selectCardBody(beginDate, endDate, typeCode, name,cardBodyType);
return resultList;
}
......@@ -64,4 +62,25 @@ public class MaterialManagementServiceImpl implements MaterialManagementService
}
@Override
public boolean updateCardBodyState(long id) {
return materialManagementMapper.updateCardBodyState(id);
}
@Override
public List<CardBodyEntity> selectCardBody() {
return materialManagementMapper.selectCardBodyByState();
}
@Override
public boolean updatePlasticFilm(long id) {
return materialManagementMapper.updatePlasticFilmState(id);
}
@Override
public List<PlasticFilmEntity> selectPlasticFilm() {
return materialManagementMapper.selectPlasticFilmByState();
}
}
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ 7fe3f10a
......@@ -152,7 +152,7 @@ public class ReceiptServiceImpl implements ReceiptService {
@Override
public List<Map<String, Object>> selectReceiptDateByCheckDate(String stratDate,String endDate) {
List<Map<String, Object>> mapList = receiptMapper.selectReceiptDateByCheckDate(stratDate, endDate);
List<Map<String, Object>> mapList = receiptMapper.selectReceiptDateByCheckDate((stratDate), (endDate));
List<Map<String, Object>> mapList1 = formateMap(mapList);
return mapList1;
}
......@@ -389,4 +389,16 @@ public class ReceiptServiceImpl implements ReceiptService {
return "";
}
/**
* 字符串去除空格
*
* @param str 原始字符串
* @return 返回新的字符串
*/
private String replaceNullString(String str) {
if (str == "") {
return null;
} else return str;
}
}
src/main/resources/static/dialogs/updateNote.html
View file @ 7fe3f10a
......@@ -19,6 +19,12 @@
</tbody>
</table>
</div>
<div class="ui-dialog-confirm">
<div class="ui-dialog-confirm clearfix">
<div class="pull-left" ng-if="consoleMsg" style="color: red;margin-left: 69px;">
{{consoleMsg}}
</div>
<div class="pull-right">
<button type="submit" class="btn btn-info" ng-click="updateNoteData()">更新</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">关闭</button>
</div>
</div>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 7fe3f10a
......@@ -244,9 +244,9 @@ angular.module('AvatarCheck', [
$scope.logout = function(){
HttpService.logout(function(data) {
$location.path('/login')
$rootScope.loginData = {userid:'用户未登录', login:false};
localStorage.clear();
$location.path("/login");
});
}
$scope.enterEvent = function(e,search) {
......@@ -288,6 +288,8 @@ angular.module('AvatarCheck', [
if($(".prod:checked").length>0){
if(angular.isUndefined($scope.searchResult.workOrderData[0].CARD_TYPE_ID)){
MessageService.showAlert("无制证类型记录，请创建任务单后再添加快证")
}else if($scope.searchResult.workOrderData[0].POSITION_DATE!=null){
MessageService.showAlert("该证件正在分拣，不能添加快证")
}else{
var idx = $(".prod:checked").val();
var check = idx.split("+");
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 7fe3f10a
......@@ -62,14 +62,14 @@
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th>保存日期</th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>受理组号</th>
<th>合格数量</th>
<th>不合格数量</th>
<th>状态</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
<tbody ng-repeat="task in type.countyList">
<tr>
<td ng-if="task.dealFlag==3"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
<td ng-if="task.dealFlag!=3"></td>
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 7fe3f10a
......@@ -38,9 +38,9 @@
<thead>
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
<th>任务单编号</th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>受理组号</th>
<th>证件数量</th>
<th>合格数量</th>
<th>不合格数量</th>
......@@ -48,7 +48,7 @@
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
<tbody ng-repeat="task in type.countyList">
<tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
......
src/main/resources/static/views/insertFilm/insertFilm.html
View file @ 7fe3f10a
......@@ -93,12 +93,9 @@
<th>塑料膜表流水号</th>
<th>保存时间</th>
<th>数量</th>
<th>膜类型</th>
<th>操作</th>
<th>备注</th>
<th>提交人</th>
<!--<th>出库总数</th>-->
<!--<th>入库总数</th>-->
</tr>
</thead>
......@@ -111,14 +108,16 @@
<td ng-if="item.plasticFilmType==2">入库</td>
<td>{{item.note}}</td>
<td>{{item.name}}</td>
<!--<td>{{item.plasticFilmCount1}}</td>-->
<!--<td>{{item.plasticFilmCount2}}</td>-->
</tr>
<tr>
<tr class="bg-info">
<th>合计</th>
<td colspan="2" ng-if="plasticFilmType2==1" >{{plasticFilmdata.plasticFilmCount1}}</td>
<td colspan="2" ng-if="plasticFilmType2==2" >{{plasticFilmdata.plasticFilmCount2}}</td>
<th>出库数：</th>
<th ng-if="plasticFilmdata.plasticFilmCount1==null">0</th>
<th ng-if="plasticFilmdata.plasticFilmCount1!=null">{{plasticFilmdata.plasticFilmCount1}}</th>
<th colspan="2">入库数：</th>
<th ng-if="plasticFilmdata.plasticFilmCount2==null">0</th>
<th ng-if="plasticFilmdata.plasticFilmCount2!=null">{{plasticFilmdata.plasticFilmCount2}}</th>
</tr>
......
src/main/resources/static/views/insertFilm/insertFilm.js
View file @ 7fe3f10a
......@@ -39,12 +39,9 @@ angular.module("AvatarCheck.insertFilm",['ngRoute', 'AvatarCheck.http'])
}
console.log(totalCount, plasticFilmType, note, name)
HttpService.insertFilm(totalCount, plasticFilmType, note, name, function (data) {
if(data==false){
MessageService.showAlert("插入失败")
}else{
MessageService.showAlert("插入成功")
}
console.log(data)
$scope.totalCount="";
$scope.note="";
$scope.selectPlasticFilmManagement();
})
}
......
src/main/resources/static/views/receitp/receitp.js
View file @ 7fe3f10a
......@@ -62,12 +62,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory = 0;
var startDate=$('#datepicker1').val();
var endDate=$('#datepicker2').val();
if(startDate==''){
startDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
}
if(endDate==''){
endDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
}
HttpService.getReceitp(startDate,endDate,function(data){
$scope.receitpData=data;
for(var i=0;i<$scope.receitpData.length;i++){
......@@ -86,12 +80,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory = 1;
var startDate=$('#datepicker1').val();
var endDate=$('#datepicker2').val();
if(startDate==''){
startDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
}
if(endDate==''){
endDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
}
HttpService.getHistoryReceitp(startDate,endDate,function(data){
$scope.receitpHistoryData=data;
for(var i=0;i<$scope.receitpHistoryData.length;i++){
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 7fe3f10a
......@@ -9,11 +9,25 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
});
}])
.controller('tagPrintCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
.controller('tagPrintCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog,$location) {
var getPoliceListDataNotChecked = function () {
HttpService.getPoliceListDataNotCheckedData(function(data){
$scope.tagPrintData = data;
for(var i=0;i<$scope.tagPrintData.length;i++){
$scope.tagPrintData[i].show = false;
}
console.log($scope.tagPrintData)
})
};
$scope.acceptNo = 'ACCEPT_NO';
if($rootScope.loginData.login === false){
$location.path("/login");
}else{
getPoliceListDataNotChecked();
}
$scope.acceptNo = 'ACCEPT_NO';
var postParam={
idCard:'',
......@@ -65,16 +79,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
getDetailListById(item.ID);
};
var getPoliceListDataNotChecked = function () {
HttpService.getPoliceListDataNotCheckedData(function(data){
$scope.tagPrintData = data;
for(var i=0;i<$scope.tagPrintData.length;i++){
$scope.tagPrintData[i].show = false;
}
console.log($scope.tagPrintData)
})
};
getPoliceListDataNotChecked();
$scope.checkSame = function (id) {
HttpService.updateReceiptList(id,function(data) {
......
src/main/resources/static/views/task/taskListEwriting.html
View file @ 7fe3f10a
......@@ -34,10 +34,10 @@
<thead>
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
<th>任务单编号</th>
<th>核验日期</th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>受理组号</th>
<th>证件数量</th>
<th>电写入数量</th>
<th>电质检数量</th>
......@@ -46,7 +46,7 @@
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
<tbody ng-repeat="task in type.countyList">
<tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 7fe3f10a
......@@ -38,10 +38,10 @@
<thead>
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
<th>任务单编号</th>
<th>核验日期</th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>受理组号</th>
<th>核验数量</th>
<th>卸载数量</th>
<th>证件数量</th>
......@@ -51,7 +51,7 @@
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
<tbody ng-repeat="task in type.countyList">
<tr>
<td><input type="checkbox" id="checkOneBox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 7fe3f10a
......@@ -40,10 +40,10 @@
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)"
ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
<th>任务单编号</th>
<th>核验日期</th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>受理组号</th>
<th>证件数量</th>
<th>电写入数量</th>
<th>电质检数量</th>
......@@ -54,7 +54,7 @@
<!--<th></th>-->
</tr>
</thead>
<tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
<tbody ng-repeat="task in type.countyList">
<tr>
<td ng-if="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)">
<input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}"
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 7fe3f10a
......@@ -109,10 +109,11 @@
<th>联系方式</th>
<th>地址</th>
<th>打印时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in postData | orderBy:item.id" ng-click="showDetail(item)" style="cursor: pointer;">
<tr ng-repeat="item in postData | orderBy:item.id">
<td>{{item.id}}</td>
<td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}}</td>
......@@ -120,14 +121,15 @@
<td>{{item.firstWhite}}</td>
<td>{{item.applicantName}}</td>
<td>{{item.recipientPhone}}</td>
<td>{{item.recipientAddress}}</td>
<td ng-click="showDetail(item)"><a>{{item.recipientAddress}}</a></td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td ng-click="addNote(item.id)"><a>备注</a></td>
</tr>
</tbody>
</table>
<div class="box-footer" ng-if="postData.length>0">
<!--<div class="box-footer" ng-if="postData.length>0">
<button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button>
</div>
</div>-->
<div style="padding-left: 27%;" ng-if="postData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 7fe3f10a
......@@ -339,11 +339,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}
$scope.addNote = function () {
$scope.addNote = function (id) {
var arr = [];
for (var i=0;i<$scope.postData.length;i++){
arr.push($scope.postData[i].id)
}
arr.push(id);
ngDialog.open({
template: 'dialogs/updateNote.html' + urlTimeStamp(),
width: 800,
......@@ -353,7 +351,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
console.log(arr)
HttpService.getNoteToUpdate(arr,function(data) {
$scope.idAndNote = data;
console.log( $scope.idAndNote)
console.log($scope.idAndNote)
})
$scope.updateNoteData = function(){
......@@ -367,8 +365,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}
HttpService.updateTheseNote(arr,function(data) {
if(data){
$scope.closeThisDialog();
MessageService.showAlert("更新成功")
$scope.consoleMsg = "更新成功";
}
})
}
......
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