Commit 8e5daa37 authored by Administrator's avatar Administrator

修改了查询废证详情findFailedList

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