Commit 8e5daa37 authored by Administrator's avatar Administrator

修改了查询废证详情findFailedList

parent e1cc5325
......@@ -289,13 +289,15 @@ public class UserApi {
*
* @return
*/
@RequestMapping("findFailedinfo")
@RequiresPermissions("userInfo.add")//权限管理;
public String findFailedinfo(@RequestParam("id") String id, HttpServletResponse resp) {
@RequestMapping("findFailedList")
// @RequiresPermissions("userInfo.add")//权限管理;
public String findFailedList(@RequestParam("state") String state, HttpServletResponse resp) {
List<FailedCardEntity> failedList = failedCardService.findFailedList(state);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
List<Map<String, Object>> maps = failedCardService.selectFailedinfo(valueOf(id));
yxjsonResponse.outPutSuccess(maps + "------添加成功---" + maps.size());
yxjsonResponse.outPutSuccess(failedList);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
......
......@@ -11,96 +11,92 @@ import java.util.Objects;
@Entity
@Table(name = "FAILED_CARD", schema = "DAHAI")
public class FailedCardEntity {
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 failedCardId;
private long failedCardReasonId;
private String acceptNo;
private long taskId;
private Date positionDate;
private Date finishDate;
private Date allotDate;
private Date printDate;
private long state;
@Id
@Column(name = "FAILED_CARD_ID", nullable = false, precision = 0)
public long getFailed_Card_Id() {
return failed_Card_Id;
public long getFailedCardId() {
return failedCardId;
}
public void setFailed_Card_Id(long failed_Card_Id) {
this.failed_Card_Id = failed_Card_Id;
public void setFailedCardId(long failedCardId) {
this.failedCardId = failedCardId;
}
@Basic
@Column(name = "FAILED_CARD_REASON_ID", nullable = true, precision = 0)
public long getFailed_Card_Reason_Id() {
return failed_Card_Reason_Id;
public long getFailedCardReasonId() {
return failedCardReasonId;
}
public void setFailed_Card_Reason_Id(long failed_Card_Reason_Id) {
this.failed_Card_Reason_Id = failed_Card_Reason_Id;
public void setFailedCardReasonId(long failedCardReasonId) {
this.failedCardReasonId = failedCardReasonId;
}
@Basic
@Column(name = "ACCEPT_NO", nullable = true, length = 20)
public String getAccept_No() {
return accept_No;
public String getAcceptNo() {
return acceptNo;
}
public void setAccept_No(String accept_No) {
this.accept_No = accept_No;
public void setAcceptNo(String acceptNo) {
this.acceptNo = acceptNo;
}
@Basic
@Column(name = "TASK_ID", nullable = false, precision = 0)
public long getTask_Id() {
return task_Id;
public long getTaskId() {
return taskId;
}
public void setTask_Id(long task_Id) {
this.task_Id = task_Id;
public void setTaskId(long taskId) {
this.taskId = taskId;
}
@Basic
@Column(name = "POSITION_DATE", nullable = true, length = 20)
public Date getPosition_Date() {
return position_Date;
public Date getPositionDate() {
return positionDate;
}
public void setPosition_Date(Date position_Date) {
this.position_Date = position_Date;
public void setPositionDate(Date positionDate) {
this.positionDate = positionDate;
}
@Basic
@Column(name = "FINISH_DATE", nullable = true, length = 20)
public Date getFinish_Date() {
return finish_Date;
@Column(name = "FINSH_DATE", nullable = true, length = 20)
public Date getFinishDate() {
return finishDate;
}
public void setFinish_Date(Date finish_Date) {
this.finish_Date = finish_Date;
public void setFinishDate(Date finishDate) {
this.finishDate = finishDate;
}
@Basic
@Column(name = "ALLOT_DATE", nullable = true, length = 20)
public Date getAllot_Date() {
return allot_Date;
public Date getAllotDate() {
return allotDate;
}
public void setAllot_Date(Date allot_Date) {
this.allot_Date = allot_Date;
public void setAllotDate(Date allotDate) {
this.allotDate = allotDate;
}
@Basic
@Column(name = "PRINT_DATE", nullable = true, length = 20)
public Date getPrint_Date() {
return print_Date;
public Date getPrintDate() {
return printDate;
}
public void setPrint_Date(Date print_Date) {
this.print_Date = print_Date;
public void setPrintDate(Date printDate) {
this.printDate = printDate;
}
@Basic
@Column(name = "STATE", nullable = false, precision = 0)
public long getState() {
......@@ -116,21 +112,21 @@ public class FailedCardEntity {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FailedCardEntity that = (FailedCardEntity) o;
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) &&
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) &&
Objects.equals(state, that.state) &&
Objects.equals(finish_Date, that.finish_Date);
Objects.equals(finishDate, that.finishDate);
}
@Override
public int hashCode() {
return Objects.hash(failed_Card_Id, failed_Card_Reason_Id, accept_No, task_Id, position_Date, finish_Date, allot_Date, print_Date, state);
return Objects.hash(failedCardId, failedCardReasonId, acceptNo, taskId, positionDate, finishDate, allotDate, printDate, state);
}
}
......@@ -32,7 +32,7 @@ public interface FailedCardMapper {
* @return
*/
// @SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="selectFailedinfoBycolumnName")
public List<Map<String,Object>> selectFailedCardEntityByState(int state);
public List<FailedCardEntity> findFailedList(String state);
......
......@@ -11,5 +11,5 @@ import java.util.Map;
public interface FailedCardService {
public int saveFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public int updateFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public List<Map<String,Object>> selectFailedinfo(int state);
public List<FailedCardEntity> findFailedList(String state);
}
......@@ -34,8 +34,8 @@ public class FailedCardServiceImpl implements FailedCardService {
}
@Override
public List<Map<String,Object>> selectFailedinfo(int state) {
List<Map<String, Object>> maps = failedCardMapper.selectFailedCardEntityByState(state);
return maps;
public List<FailedCardEntity> findFailedList(String state) {
List<FailedCardEntity> failedList = failedCardMapper.findFailedList(state);
return failedList;
}
}
......@@ -13,8 +13,8 @@
<result column="STATE" property="state" jdbcType="NUMERIC"/>
</resultMap>
<select id="selectFailedCardEntityByState" resultType="java.util.HashMap" parameterType="java.lang.Integer">
select * from FAILED_CARD where state = #{state}
<select id="findFailedList" resultType="com.yxproject.start.entity.FailedCardEntity" parameterType="String">
select FAILED_CARD_ID as failedCardId, FAILED_CARD_REASON_ID as failedCardReasonId, ACCEPT_NO as acceptNo, TASK_ID as taskId, POSITION_DATE as positionDate, FINISH_DATE as finishDate, ALLOT_DATE as allotDate, PRINT_DATE as printDate, STATE as state from FAILED_CARD where STATE = #{state}
</select>
<insert id="saveFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity" >
......
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