Skip to content

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

修改添加废证API 

修改添加废证页面
parent f493d4d1
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 69 deletions
src/main/java/com/yxproject/start/api/UserApi.java
View file @ d3c4062b
......@@ -247,13 +247,31 @@ public class UserApi {
* @return
*/
@RequestMapping("addFailedinfo")
public String addFailedinfo(@RequestParam("idNo") String id, HttpServletResponse resp) {
String map = "[{\"failedinfoid\":\"20181016002\",\"failed_Reason\":1,\"groupno\":\"41108201\",\"cyclesheetid\":\"20181016001\"}]";
JSONArray jsonArray = JSONArray.fromObject(map);
public String addFailedinfo(@RequestParam("idNo") String idNo, HttpServletResponse resp) throws Exception {
JSONObject jsonObject = JSONObject.fromObject(idNo);
Map<String, List> map = jsonObject;
List<Map<String,String>> list = map.get("list");
List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
for (Object object : jsonArray) {
FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class);
failedinfoEntityList.add(o);
for (Map<String,String> acceptMap : list) {
FailedCardEntity failedCardEntity = new FailedCardEntity();
String acceptNo = acceptMap.get("acceptNo");
failedCardEntity.setAccept_No(acceptNo);
failedCardEntity.setFailed_Card_Reason_Id(Long.valueOf(acceptMap.get("reson")));
List<FailedCardEntity> failedCardEntities = failedCardService.selectAcceptNoAtFailedCard(acceptNo);
List<SpecialCardEntity> specialCardEntities = failedCardService.selectAcceptNoAtSpecialCard(acceptNo);
List<GroupNoEntity> groupNoEntities = failedCardService.selectAcceptNoAtGroupNo(acceptNo.substring(0, 8));
if (failedCardEntities.size()!=0){
failedCardEntity.setTask_Id(failedCardEntities.get(0).getTask_Id());
}else if (specialCardEntities.size()!=0){
failedCardEntity.setTask_Id(specialCardEntities.get(0).getTask_Id());
}else if (groupNoEntities.size()!=0){
failedCardEntity.setTask_Id(groupNoEntities.get(0).getTask_Id());
}else {
throw new Exception("证件信息有误");
}
failedinfoEntityList.add(failedCardEntity);
}
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
......@@ -271,7 +289,7 @@ public class UserApi {
// @RequiresPermissions("userInfo.add")//权限管理;
public String updateFailedinfo(@RequestParam("failedCardId") String id,@RequestParam("state") String state, HttpServletResponse resp) {
FailedCardEntity failedCardEntity = new FailedCardEntity();
failedCardEntity.setFailedCardId(Long.valueOf(id));
failedCardEntity.setFailed_Card_Id(Long.valueOf(id));
failedCardEntity.setState(Long.valueOf(state));
List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
// for (Object object : jsonArray) {
......
src/main/java/com/yxproject/start/entity/FailedCardEntity.java
View file @ d3c4062b
......@@ -11,90 +11,87 @@ import java.util.Objects;
@Entity
@Table(name = "FAILED_CARD", schema = "DAHAI")
public class FailedCardEntity {
private long failedCardId;
private long failedCardReasonId;
private String acceptNo;
private long taskId;
private Date positionDate;
private Date finishDate;
private Date allotDate;
private Date printDate;
private long failed_Card_Id;
private long failed_Card_Reason_Id;
private String accept_No;
private long task_Id;
private Date position_Date;
private Date finish_Date;
private Date allot_Date;
private Date print_Date;
private long state;
@Id
@Column(name = "FAILED_CARD_ID", nullable = false, precision = 0)
public long getFailedCardId() {
return failedCardId;
public long getFailed_Card_Id() {
return failed_Card_Id;
}
public void setFailedCardId(long failedCardId) {
this.failedCardId = failedCardId;
public void setFailed_Card_Id(long failed_Card_Id) {
this.failed_Card_Id = failed_Card_Id;
}
@Basic
@Column(name = "FAILED_CARD_REASON_ID", nullable = true, precision = 0)
public long getFailedCardReasonId() {
return failedCardReasonId;
@Column(name = "FAILED_CARD_REASON_ID", nullable = true)
public long getFailed_Card_Reason_Id() {
return failed_Card_Reason_Id;
}
public void setFailedCardReasonId(long failedCardReasonId) {
this.failedCardReasonId = failedCardReasonId;
public void setFailed_Card_Reason_Id(long failed_Card_Reason_Id) {
this.failed_Card_Reason_Id = failed_Card_Reason_Id;
}
@Basic
@Column(name = "ACCEPT_NO", nullable = true, length = 20)
public String getAcceptNo() {
return acceptNo;
public String getAccept_No() {
return accept_No;
}
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
public void setAccept_No(String accept_No) {
this.accept_No = accept_No;
}
@Basic
@Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTaskId() {
return taskId;
public long getTask_Id() {
return task_Id;
}
public void setTaskId(long taskId) {
this.taskId = taskId;
public void setTask_Id(long task_Id) {
this.task_Id = task_Id;
}
@Basic
@Column(name = "POSITION_DATE", nullable = true, length = 20)
public Date getPositionDate() {
return positionDate;
public Date getPosition_Date() {
return position_Date;
}
public void setPositionDate(Date positionDate) {
this.positionDate = positionDate;
public void setPosition_Date(Date position_Date) {
this.position_Date = position_Date;
}
@Basic
@Column(name = "FINSH_DATE", nullable = true, length = 20)
public Date getFinishDate() {
return finishDate;
public Date getFinish_Date() {
return finish_Date;
}
public void setFinishDate(Date finishDate) {
this.finishDate = finishDate;
public void setFinish_Date(Date finish_Date) {
this.finish_Date = finish_Date;
}
@Basic
@Column(name = "ALLOT_DATE", nullable = true, length = 20)
public Date getAllotDate() {
return allotDate;
public Date getAllot_Date() {
return allot_Date;
}
public void setAllotDate(Date allotDate) {
this.allotDate = allotDate;
public void setAllot_Date(Date allot_Date) {
this.allot_Date = allot_Date;
}
@Basic
@Column(name = "PRINT_DATE", nullable = true, length = 20)
public Date getPrintDate() {
return printDate;
public Date getPrint_Date() {
return print_Date;
}
public void setPrintDate(Date printDate) {
this.printDate = printDate;
public void setPrint_Date(Date print_Date) {
this.print_Date = print_Date;
}
@Basic
......@@ -112,21 +109,21 @@ public class FailedCardEntity {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FailedCardEntity that = (FailedCardEntity) o;
return Objects.equals(failedCardId, that.failedCardId) &&
Objects.equals(failedCardReasonId, that.failedCardReasonId) &&
Objects.equals(acceptNo, that.acceptNo) &&
Objects.equals(taskId, that.taskId) &&
Objects.equals(positionDate, that.positionDate) &&
Objects.equals(allotDate, that.allotDate) &&
Objects.equals(printDate, that.printDate) &&
return Objects.equals(failed_Card_Id, that.failed_Card_Id) &&
Objects.equals(failed_Card_Reason_Id, that.failed_Card_Reason_Id) &&
Objects.equals(accept_No, that.accept_No) &&
Objects.equals(task_Id, that.task_Id) &&
Objects.equals(position_Date, that.position_Date) &&
Objects.equals(allot_Date, that.allot_Date) &&
Objects.equals(print_Date, that.print_Date) &&
Objects.equals(state, that.state) &&
Objects.equals(finishDate, that.finishDate);
Objects.equals(finish_Date, that.finish_Date);
}
@Override
public int hashCode() {
return Objects.hash(failedCardId, failedCardReasonId, acceptNo, taskId, positionDate, finishDate, allotDate, printDate, state);
return Objects.hash(failed_Card_Id, failed_Card_Reason_Id, accept_No, task_Id, position_Date, finish_Date, allot_Date, print_Date, state);
}
}
src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @ d3c4062b
package com.yxproject.start.mapper;
import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......@@ -34,6 +36,28 @@ public interface FailedCardMapper {
// @SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="selectFailedinfoBycolumnName")
public List<FailedCardEntity> findFailedList(String state);
/**
* 查询废证的任务单
* 在废证表中
* @param accept_No 废证受理号
* @return
*/
public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No);
/**
* 查询废证的任务单
* 在特证表中
* @param accept_No 废证受理号
* @return
*/
public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No);
/**
* 查询废证的任务单
* 在组号表中
* @param groupNo 废证受理组号
* @return
*/
public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo);
......
src/main/java/com/yxproject/start/service/FailedCardService.java
View file @ d3c4062b
package com.yxproject.start.service;
import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import java.util.List;
import java.util.Map;
......@@ -12,4 +14,8 @@ public interface FailedCardService {
public int saveFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public int updateFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public List<FailedCardEntity> findFailedList(String state);
public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No);
public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No);
public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo);
}
src/main/java/com/yxproject/start/service/impl/FailedCardServiceImpl.java
View file @ d3c4062b
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.mapper.FailedCardMapper;
import com.yxproject.start.service.FailedCardService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -38,4 +40,23 @@ public class FailedCardServiceImpl implements FailedCardService {
List<FailedCardEntity> failedList = failedCardMapper.findFailedList(state);
return failedList;
}
@Override
public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No) {
List<FailedCardEntity> failedCardEntities = failedCardMapper.selectAcceptNoAtFailedCard(accept_No);
return failedCardEntities;
}
@Override
public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No) {
List<SpecialCardEntity> specialCardEntities = failedCardMapper.selectAcceptNoAtSpecialCard(accept_No);
return specialCardEntities;
}
@Override
public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo) {
List<GroupNoEntity> groupNoEntities = failedCardMapper.selectAcceptNoAtGroupNo(groupNo);
return groupNoEntities;
}
}
src/main/resources/mapper/FailedCardMapper.xml
View file @ d3c4062b
......@@ -18,8 +18,8 @@
</select>
<insert id="saveFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity" >
insert into FAILED_CARD (FAILED_CARD_ID,FAILED_CARD_REASON_ID,ACCEPT_NO,TASK_ID,POSITION_DATE,FINISH_DATE,ALLOT_DATE,PRINT_DATE,STATE )
values (#{failed_Card_Id},#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{position_Date},#{finish_Date},#{allot_Date},#{print_Date},#{state})
insert into FAILED_CARD (failed_Card_Reason_Id,ACCEPT_NO,TASK_ID,STATE )
values (#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{state})
</insert>
<update id="updateFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity">
......@@ -36,5 +36,13 @@ update FAILED_CARD
</set>
where failed_Card_Id =#{failed_Card_Id}
</update>
<select id="selectAcceptNoAtFailedCard" resultType="com.yxproject.start.entity.FailedCardEntity" parameterType="String">
select * from failed_card where accept_No =#{accept_No}
</select>
<select id="selectAcceptNoAtSpecialCard" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
select * from special_card where accept_No =#{accept_No}
</select>
<select id="selectAcceptNoAtGroupNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
select * from group_no where group_no =#{groupNo}
</select>
</mapper>
\ No newline at end of file
src/main/resources/static/js/services/service.js
View file @ d3c4062b
......@@ -529,10 +529,13 @@ app.service('MessageService', function (ngDialog) {
})
},
saveFailedCardsID:function(success){
saveFailedCardsID:function(idNo,success){
$http({
method: 'GET',
url: "../yingxin/addInValidCardInfo" + urlTimeStamp(),
url: "../user/addFailedinfo" + urlTimeStamp(),
params:{
idNo:idNo
}
}).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data)
......
src/main/resources/static/tpl/layout/addFailedCard/addFailedCard.js
View file @ d3c4062b
......@@ -85,7 +85,7 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
$scope.dataInfo = data.respData;
console.log($scope.dataInfo,"-=====$scope.dataInfo====")
var count = 0;
for(var i=0;i<$scope.dataInfo.size;i++){
for(var i=0;i<$scope.dataInfo.length;i++){
if($scope.dataInfo[i].name!=null){
count+=1;
}else{
......@@ -96,6 +96,9 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
$scope.confirmFailedInfo = function () {
console.log($rootScope.arr)
$(".confirmBtn").attr("disabled", true);
console.log(count,"--------count");
console.log($scope.dataInfo.length,"--$scope.dataInfo.length--");
console.log($scope.dataInfo,"---$scope.dataInfo----");
if(count==$scope.dataInfo.length){
HttpService.saveFailedCardsID($rootScope.arr,function(data){
$scope.isShowSuccess = 1;
......
src/main/resources/static/tpl/layout/failedCard/failedCard.html
View file @ d3c4062b
......@@ -39,7 +39,7 @@
<span style="padding-left:10px;"
ng-show="failedCard.allotDate==null">未分配</span>
<span style="padding-left:10px;"
ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}}</span></span>
ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}</span></span>
</td>
<td>{{failedCard.positionDate}}</td>
<td>{{failedCard.state}}</td>
......
src/main/resources/static/tpl/layout/searchSpecialCard/searchSpecialCard.html
View file @ d3c4062b
......@@ -574,7 +574,7 @@
<div class="panel-heading">
<h3 class="panel-title">
循环单
</h3>
</h3>分配时间
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
......
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