修改保存卡机统计数据 添加卡机类型 身份证

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

@@ -2,7 +2,6 @@ package com.yxproject.start.api;
 
 import com.yxproject.start.entity.CountyDicEntity;
 import com.yxproject.start.service.LogService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,13 +35,6 @@ public class LogApi {
         List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,replaceDate(createDate),uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize));
         return result;
     }
-//    @RequestMapping("selectNewFilesLog")
-//    public List<Map<String,Object>> selectNewFilesLog (@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
-//        List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,replaceDate(createDate),uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize));
-//        return result;
-//    }
-
-
 
     /**
      * 查询新包生成日志总数

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

@@ -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){
-        boolean result = materialManagementService.insertCardBody(cardType, totalCount, note,name);
+    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);
         return result;
     }
 

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

@@ -273,8 +273,9 @@ public class TaskListApi {
                     dataAuditingEntity.setPoliceSubstation(map.get("POLICE_SUBSTATION")+"");
                     dataAuditingEntities.add(dataAuditingEntity);
                 }
-                boolean b = taskListService.saveTask(objects, name, 0 + "");
                 dataAuditingService.saveDataAuditingList(dataAuditingEntities);
+                boolean b = taskListService.saveTask(objects, name, 0 + "");
+
             }
         }
         Map<String, Object> map = new LinkedHashMap<>();

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

@@ -13,11 +13,12 @@ import java.util.Objects;
 @Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "")
 public class CardBodyEntity {
     private long cardBodyId;
-    private String saveDate;
+    private Date saveDate;
     private Long cardType;
     private Long totalCount;
     private String note;
     private String name;
+    private Long cardBodyType;
 
     @Id
     @Column(name = "CARD_BODY_ID")
@@ -31,11 +32,11 @@ public class CardBodyEntity {
 
     @Basic
     @Column(name = "SAVE_DATE")
-    public String getSaveDate() {
+    public Date getSaveDate() {
         return saveDate;
     }
 
-    public void setSaveDate(String saveDate) {
+    public void setSaveDate(Date saveDate) {
         this.saveDate = saveDate;
     }
 
@@ -89,11 +90,22 @@ public class CardBodyEntity {
                 Objects.equals(cardType, that.cardType) &&
                 Objects.equals(totalCount, that.totalCount) &&
                 Objects.equals(note, that.note) &&
+                Objects.equals(cardBodyType, that.cardBodyType) &&
                 Objects.equals(name, that.name);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(cardBodyId, saveDate, cardType, totalCount, note, name);
+        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;
     }
 }

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

@@ -50,8 +50,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)VALUES(#{cardType},#{totalCount},#{note},#{name})")
-    public boolean insertCardBody(@Param("cardType") String cardType, @Param("totalCount") String totalCount, @Param("note") String note, @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);
 
 
     @Select("<script>" +

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

@@ -14,7 +14,7 @@ public interface MaterialManagementService {
 
     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);
+    public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, String name,String cardBodyType);
 
     public List<CardBodyEntity> selectCardBody(@Param("beginDate")String beginDate, @Param("endDate")String endDate,String typeCode, String name);
 

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

@@ -28,8 +28,8 @@ public class MaterialManagementServiceImpl implements MaterialManagementService
     }
 
     @Override
-    public boolean insertCardBody( String cardType, String totalCount, String note,String name) {
-        materialManagementMapper.insertCardBody(cardType,totalCount,note,name);
+    public boolean insertCardBody( String cardType, String totalCount, String note,String name,String cardBodyType) {
+        materialManagementMapper.insertCardBody(cardType,totalCount,note,name,Long.valueOf(cardBodyType));
         return true;
     }