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

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

@@ -36,16 +36,6 @@ public class LogApi {
         return result;
     }
 
-    /**
-     * 查询公安局列表
-     * @return list
-     */
-    @RequestMapping("selectCountyList")
-    public List<CountyDicEntity> selectCountyList(){
-        List<CountyDicEntity> list = logService.getCountyList();
-        return list;
-    }
-
     /**
      * 查询新包生成日志总数
      * @param newFileName 新包名称
@@ -61,6 +51,16 @@ public class LogApi {
        return total;
     }
 
+    /**
+     * 查询公安局列表
+     * @return list
+     */
+    @RequestMapping("selectCountyList")
+    public List<CountyDicEntity> selectCountyList(){
+        List<CountyDicEntity> list = logService.getCountyList();
+        return list;
+    }
+
 
     /**
      * 查询解析日志

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;
     }
 
@@ -76,9 +76,9 @@ public class MaterialManagementApi {
      * @return
      */
     @RequestMapping("selectCardBodyManagement")
-    public Map<String,Object> selectCardBodyManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name){
+    public Map<String,Object> selectCardBodyManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name,@Param("cardBodyType")String cardBodyType){
         Map<String,Object> resultMap = new HashMap<>();
-        List<CardBodyEntity> cardBodyEntities = materialManagementService.selectCardBody(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
+        List<CardBodyEntity> cardBodyEntities = materialManagementService.selectCardBody(replaceDate(beginDate),replaceDate(endDate),typeCode,name,cardBodyType);
         String cardCount1 = materialManagementService.selectCardCount1(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
         String cardCount2 = materialManagementService.selectCardCount2(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
         resultMap.put("cardBody",cardBodyEntities);

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/LogMapper.java

@@ -85,8 +85,8 @@ public interface LogMapper {
             "            SELECT A.*, ROWNUM RN " +
             "            FROM (SELECT distinct NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC " +
             "            FROM NEW_FILES " +
-            "            RIGHT JOIN  PREPRO_PERSON ON  NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
-            "            where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null " +
+            "            left JOIN  PREPRO_PERSON ON  NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
+            "            where 1=1  " +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +
@@ -112,8 +112,7 @@ public interface LogMapper {
     //新包日志总数
     @Select("<script> " +
             "SELECT COUNT(*) FILECOUNT FROM (SELECT distinct NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC FROM NEW_FILES \n" +
-            "RIGHT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 \n" +
-            "and PREPRO_PERSON.NEW_FILE_ID is not null  " +
+            "left JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 \n" +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +

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>" +
@@ -62,8 +62,11 @@ public interface MaterialManagementMapper {
             "<if test='typeCode != 0 '>" +
             " and card_type =#{typeCode} " +
             "</if>" +
+            "<if test='cardBodyType != 0 '>" +
+            " and card_Body_Type =#{cardBodyType} " +
+            "</if>" +
             "</script>")
-    public List<CardBodyEntity> selectCardBody(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
+    public List<CardBodyEntity> selectCardBody(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name,@Param("cardBodyType")String cardBodyType);
 
     @Select("<script>" +
             "select sum(TOTAL_COUNT) cardType1 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=1" +

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

@@ -14,9 +14,9 @@ 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);
+    public List<CardBodyEntity> selectCardBody(@Param("beginDate")String beginDate, @Param("endDate")String endDate,String typeCode, String name,String cardBodyType);
 
     public String selectFilmCount1(@Param("beginDate") String beginDate,@Param("endDate")String endDate,String typeCode, String name);
 

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

@@ -28,14 +28,14 @@ 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;
     }
 
     @Override
-    public List<CardBodyEntity> selectCardBody(String beginDate, String endDate,String typeCode, String name) {
-        List<CardBodyEntity> resultList = materialManagementMapper.selectCardBody(beginDate, endDate, typeCode,  name);
+    public List<CardBodyEntity> selectCardBody(String beginDate, String endDate,String typeCode, String name,String cardBodyType) {
+        List<CardBodyEntity> resultList = materialManagementMapper.selectCardBody(beginDate, endDate, typeCode,  name,cardBodyType);
         return resultList;
     }