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

src/main/java/com/yxproject/start/api/UserApi.java

@@ -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();
     }
 
@@ -489,8 +491,8 @@ public class UserApi {
      */
     @RequestMapping("getCardBody")
 //    @RequiresPermissions("userInfo.add")//权限管理;
-    public String insertCardBody(@RequestParam("cardBodyId") String cardbodyid, HttpServletResponse resp) {
-        List<CardBodyEntity> cardBodyEntity =  cardBodyService.insertCardBody(cardbodyid);
+    public String getCardBody(@RequestParam("cardBodyId") String cardBodyId, HttpServletResponse resp) {
+        List<CardBodyEntity> cardBodyEntity =  cardBodyService.findCardBody(cardBodyId);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(cardBodyEntity);
@@ -498,6 +500,22 @@ public class UserApi {
         return yxjsonResponse.toJSONString();
     }
 
+    /**
+     * 添加卡基表;
+     *
+     * @return
+     */
+    @RequestMapping("addCardBody")
+//    @RequiresPermissions("userInfo.add")//权限管理;
+    public String addCardBody(@RequestParam("cardTypeId") String cardTypeId,@RequestParam("isActive") String isActive,@RequestParam("taskId") String taskId,@RequestParam("totalCount") String totalCount, HttpServletResponse resp) {
+        int i =  cardBodyService.insertCardBody(cardTypeId,isActive,taskId,totalCount);
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(i + "添加成功");
+        Map map = new HashMap();
+        return yxjsonResponse.toJSONString();
+    }
+
     /**
      * 查询简易证件信息;
      *

src/main/java/com/yxproject/start/entity/FailedCardEntity.java

@@ -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);
     }
 
 }

src/main/java/com/yxproject/start/mapper/CardBodyMapper.java

@@ -13,7 +13,8 @@ import java.util.Map;
 
 @Mapper
 public interface CardBodyMapper {
-    public List <CardBodyEntity> insertCardBody(String cardBodyId);
+    public List <CardBodyEntity> findCardBody(String cardBodyId);
+    public int insertCardBody(@Param("cardTypeId") String cardTypeId,@Param("isActive") String isActive,@Param("taskId") String taskId,@Param("totalCount") String totalCount);
 //    public  int updateCardBody(CardBodyEntity map);
     public List<Map<String,Object>> findCbCountByDealdateViewData(@Param("startTime")String startTime,@Param("endTime")String endTime );
     public List<Map<String,Object>> findCbCountByDealdate();

src/main/java/com/yxproject/start/mapper/FailedCardMapper.java

@@ -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);
 
 
 

src/main/java/com/yxproject/start/service/CardBodyService.java

@@ -10,7 +10,9 @@ import java.util.Map;
  * Created by Administrator on 2018/11/7.
  */
 public interface CardBodyService {
-    public List<CardBodyEntity> insertCardBody(String cardBodyId);
+    public List<CardBodyEntity> findCardBody(String cardBodyId);
+
+    public int insertCardBody(String cardTypeId,String isActive,String taskId,String totalCount);
 
     public List<Map<String,Object>> getCbCount(String startTime,String endTime);
 

src/main/java/com/yxproject/start/service/FailedCardService.java

@@ -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);
 }

src/main/java/com/yxproject/start/service/impl/CardBodyServiceImpl.java

@@ -43,12 +43,14 @@ public class CardBodyServiceImpl implements CardBodyService {
 //        return cardBodyMapper.updateCardBody(map);
 //    }
 
-
-
-
     @Override
-    public List<CardBodyEntity> insertCardBody(String cardBodyId) {
-        List<CardBodyEntity> cardBody = cardBodyMapper.insertCardBody(cardBodyId);
+    public List<CardBodyEntity> findCardBody(String cardBodyId) {
+        List<CardBodyEntity> cardBody = cardBodyMapper.findCardBody(cardBodyId);
+        return cardBody;
+    }
+
+    public int insertCardBody(String cardTypeId,String isActive,String taskId,String totalCount){
+        int cardBody = cardBodyMapper.insertCardBody(cardTypeId,isActive,taskId,totalCount);
         return cardBody;
     }
 }

src/main/java/com/yxproject/start/service/impl/FailedCardServiceImpl.java

@@ -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;
     }
 }

src/main/resources/mapper/CardBodyMapper.xml

@@ -10,9 +10,13 @@
         <result column="TOTAL_COUNT" property="total_Count" jdbcType="NUMERIC"/>
     </resultMap>
 
-    <select id="insertCardBodyEntity" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
+    <select id="findCardBody" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
     select * from CARD_BODY where CARD_BODY_ID=#{card_Body_Id}
-</select>
+    </select>
+
+    <insert id="insertCardBody"  parameterType="String" >
+        INSERT INTO CARD_BODY (CARD_TYPE_ID,IS_ACTIVE,TASK_ID,TOTAL_COUNT) VALUES (#{cardTypeId},#{isActive},#{taskId},#{totalCount})
+    </insert>
 
     <update id="updateCardBody" parameterType="com.yxproject.start.entity.CardBodyEntity">
         update CARD_BODY
@@ -30,7 +34,7 @@
 
     <select id="findCbCountByDealdateViewData" resultType="java.util.HashMap" parameterType="String">
            SELECT * FROM FINDCBCOUNTBYDEALDATE_VIEW WHERE FIND_CBCOUNT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_CBCOUNT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime}
-</select>
+    </select>
 
     <select id="findCbCountByDealdate" resultType="java.util.HashMap">
           WITH

src/main/resources/mapper/FailedCardMapper.xml

@@ -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" >