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

# Conflicts:
#	src/main/resources/static/index.html
#	src/main/resources/static/js/app.js

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

 package com.yxproject.start.api;
 
 import com.yxproject.start.entity.DeliveredFailedInfoEntity;
+import com.yxproject.start.entity.DeliveredFailedReasonEntity;
 import com.yxproject.start.entity.DeliveredImportDicEntity;
 import com.yxproject.start.entity.DeliveredInfoEntity;
 import com.yxproject.start.service.DeliveredService;
@@ -68,7 +69,7 @@ public class DeliveredApi {
         try {
             //将当前上下文初始化给  CommonsMutipartResolver （多部分解析器）
             CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
-                    requ.getSession().getServletContext());
+                    requ.getServletContext());
             // 判断是否是多数据段提交格式
             if (multipartResolver.isMultipart(requ)) {
                 MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
@@ -211,6 +212,30 @@ public class DeliveredApi {
         return mapList;
     }
 
+    /**
+     * 库房确认接收妥投失败证件
+     * @param json 妥投失败证件号
+     * @return
+     */
+    @RequestMapping("acceptDeliveredFailed")
+//    @RequiresPermissions("userInfo.add")//权限管理;
+    public boolean acceptDeliveredFailed(@RequestBody String json) {
+        JSONObject jsonObject = JSONObject.fromObject(json);
+        JSONArray jsonArray = (JSONArray) jsonObject.get("cardIdList");
+        List<String> list = (List<String>) jsonArray;
+        for (String cardId:list){
+            //todo  确认接收妥投失败证件
+            //更改妥投失败证件状态
+            //查询出对应详单信息
+            //生成新的交接单信息
+            //更改对应的详单信息
+
+
+        }
+        return true;
+    }
+
+
 
     /**
      * 删除导入妥投信息
@@ -237,6 +262,16 @@ public class DeliveredApi {
         return deliveredService.deleteDeliveredFailedById(Long.valueOf(id));
     }
 
+    /**
+     * 查询登记妥投失败类型
+     * @return 返回值
+     */
+    @RequestMapping("queryDeliveredFailedType")
+//    @RequiresPermissions("userInfo.add")//权限管理;
+    public List<DeliveredFailedReasonEntity> queryDeliveredFailedType(){
+        return deliveredService.selectDeliveredFailedType();
+    }
+
 
 
     /**

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

@@ -68,7 +68,7 @@ public class ExportExcelApi {
         String startDate = jsonObject.get("startDate").toString();
         String endDate = jsonObject.get("endDate").toString();
         String type = jsonObject.get("type").toString();
-        Map<String, Object> map = receiptService.selectReceiptList(jsonArray, replaceDate(startDate),replaceDate(endDate), Long.valueOf(type));
+        Map<String, Object> map = receiptService.selectReceiptList(jsonArray, replaceDate(startDate), replaceDate(endDate), Long.valueOf(type));
 //        response.setContentType("application/x-download");
 //        response.setCharacterEncoding("UTF-8");
 //        String dateTime = DateFormatUtils.format(new Date(), "yyyy_MM_dd");
@@ -113,7 +113,7 @@ public class ExportExcelApi {
      * @return
      */
     private String replaceDate(String str) {
-        return str.replace("-", "").replace(" ","").replace(":","");
+        return str.replace("-", "").replace(" ", "").replace(":", "");
     }
 
 

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

@@ -85,7 +85,7 @@ public class FailedCardApi {
                 idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
             }
             int initiator = 5;
-            failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"),idMap.get("WORK_GROUP").toString());
+            failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"), idMap.get("WORK_GROUP").toString());
         }
         return true;
     }
@@ -96,7 +96,6 @@ public class FailedCardApi {
      * @param jsonStr
      * @return
      */
-    //TODO  多张余证可以生成一张任务单   判断是否是同一个countyCode
     @RequestMapping("insertRemaining")
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertRemaining(@RequestBody String jsonStr) {
@@ -115,10 +114,10 @@ public class FailedCardApi {
             taskEntity.setCardType(cardType);
             taskEntity.setTaskStateId((long) 1);
             taskEntity.setSubmitName(name);
-            if ("null".equals(resultMap.get("WORK_GROUP")+"")){
+            if ("null".equals(resultMap.get("WORK_GROUP") + "")) {
 
-            }else {
-                taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP")+""));
+            } else {
+                taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP") + ""));
             }
             /*特证数+1*/
             failedCardService.specialCardAdd(acceptNo);

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.transaction.Transactional;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -45,6 +46,7 @@ public class PersonPostApi {
      * @return
      */
     @RequestMapping("selectNote")
+    @Transactional
     public List<Map<String,Object>>selectNote(@RequestBody String jsonStr){
 
         List<Map<String,Object>> resultList = new ArrayList<>();
@@ -62,6 +64,7 @@ public class PersonPostApi {
      * @return
      */
     @RequestMapping("addNote")
+    @Transactional
     public boolean addNote(@RequestBody String jsonStr){
         JSONArray jsonArray = JSONArray.fromObject(jsonStr);
         for (int i=0;i<jsonArray.size();i++){
@@ -78,6 +81,7 @@ public class PersonPostApi {
      * @return
      */
     @RequestMapping("findPersonalDataCount")
+    @Transactional
     public int findPersonalDataCount(@RequestBody String jsonStr){
         JSONObject jsonObject = JSONObject.fromObject(jsonStr);
         String applicantName = jsonObject.getString("applicantName");
@@ -98,6 +102,7 @@ public class PersonPostApi {
      * @return
      */
     @RequestMapping("findPersonalData")
+    @Transactional
     public List<PersonPostEntity> findPersonalData(@RequestBody String jsonStr){
         JSONObject jsonObject = JSONObject.fromObject(jsonStr);
         String applicantName = jsonObject.getString("applicantName");

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

@@ -68,7 +68,7 @@ public class ReadExcelApi {
         try {
             //将当前上下文初始化给  CommonsMutipartResolver （多部分解析器）
             CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
-                    requ.getSession().getServletContext());
+                    requ.getServletContext());
             // 判断是否是多数据段提交格式
             if (multipartResolver.isMultipart(requ)) {
                 MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;

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

@@ -66,7 +66,7 @@ public class ReadXmlApi {
         try {
             //将当前上下文初始化给  CommonsMutipartResolver （多部分解析器）
             CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
-                    requ.getSession().getServletContext());
+                    requ.getServletContext());
             // 判断是否是多数据段提交格式
             if (multipartResolver.isMultipart(requ)) {
                 MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;

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

@@ -75,7 +75,7 @@ public class TaskListApi {
      * taskId 任务单ID
      * name 打印转出人姓名
      * process 打印转出人所在工序
-     * printer 打印机编号
+     * failedList 废证任务单
      *
      * @return
      */
@@ -90,7 +90,22 @@ public class TaskListApi {
         List<String> list = (List<String>) jsonArray;
         return taskListService.updateState2(failedList, list, process, name);
     }
-
+    /**
+     * 更改任务单工作组
+     * （打印转出）
+     * taskId 任务单ID
+     * workGroup 工作组
+     *
+     * @return
+     */
+    @RequestMapping("updateWorkGroup")
+    public boolean updateWorkGroup(@RequestBody String json) {
+        JSONObject jsonObject = JSONObject.fromObject(json);
+        JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
+        String workGroup = jsonObject.get("workGroup").toString();
+        List<String> list = (List<String>) jsonArray;
+        return taskListService.updateWorkGroup(list, workGroup);
+    }
 
     /**
      * 查询任务单详情

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.DeliveredFailedReasonEntity;
 import com.yxproject.start.entity.DeliveredImportDicEntity;
 import com.yxproject.start.entity.DeliveredInfoEntity;
 import org.apache.ibatis.annotations.*;
@@ -45,4 +46,6 @@ public interface DeliveredInfoMapper {
 
     @Delete("delete from DELIVERED_FAILED_INFO where id = #{id}")
     public boolean deleteDeliveredFailedById(@Param("id")long id);
+    @Select("select * from DELIVERED_FAILED_REASON ")
+    public List<DeliveredFailedReasonEntity> selectDeliveredFailedType();
 }

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

@@ -26,7 +26,7 @@ public interface InfoManagementMapper {
             ") " +
             "A" +
             ")" +
-            "WHERE RN BETWEEN #{end} AND #{begin}" +
+            "WHERE RN BETWEEN #{begin} AND #{end}" +
             "</script>")
     public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("begin") long begin, @Param("end") long end);
 

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

@@ -97,9 +97,9 @@ public interface LogMapper {
             "            and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" +
             "            </if>" +
             "            <if test='cardId !=\"\"' >" +
-            "            and PREPRO_PERSON.GMSFHM=#{cardId} ORDER by CREATE_DATE " +
+            "            and PREPRO_PERSON.GMSFHM=#{cardId}  " +
             "            </if>" +
-            "            order by CREATE_DATE desc ) " +
+            "            ORDER by CREATE_DATE) " +
             "            A" +
             "            )" +
             "            WHERE RN BETWEEN #{end} AND #{begin}" +

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

@@ -14,7 +14,7 @@ import java.util.Map;
 @Mapper
 public interface MaterialManagementMapper {
     @Insert("INSERT INTO PLASTIC_FILM (TOTAL_COUNT,PLASTIC_FILM_TYPE,NOTE,name)VALUES(#{totalCount},#{plasticFilmType},#{note},#{name})")
-    public boolean insertFilm(@Param("totalCount")String totalCount,@Param("plasticFilmType")String plasticFilmType,@Param("note")String note,@Param("name")String name);
+    public boolean insertFilm(@Param("totalCount") String totalCount, @Param("plasticFilmType") String plasticFilmType, @Param("note") String note, @Param("name") String name);
 
     @Select("<script>" +
             "select * from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate}" +
@@ -22,69 +22,69 @@ public interface MaterialManagementMapper {
             " and name =#{name} " +
             "</if>" +
             "<if test='typeCode != 0 '>" +
-            " and typeCode =#{typeCode} " +
+            " and PLASTIC_FILM_TYPE =#{typeCode} " +
             "</if>" +
             "</script>")
-    public List<PlasticFilmEntity> selectFilm(@Param("beginDate") String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name);
+    public List<PlasticFilmEntity> selectFilm(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
 
     @Select("<script>" +
-            "select sum(TOTAL_COUNT) PLASTIC_FILM_TYPE1 from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and PLASTIC_FILM_TYPE=1 "+
+            "select sum(TOTAL_COUNT) PLASTIC_FILM_TYPE1 from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and PLASTIC_FILM_TYPE=1 " +
             "<if test='name != null '>" +
             " and name =#{name} " +
             "</if>" +
             "<if test='typeCode != 0 '>" +
-            " and typeCode =#{typeCode} " +
+            " and PLASTIC_FILM_TYPE =#{typeCode} " +
             "</if>" +
             "</script>")
-    public String selectFilmCount1(@Param("beginDate") String beginDate,@Param("endDate")String endDate ,@Param("typeCode")String typeCode,@Param("name")String name);
+    public String selectFilmCount1(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
 
     @Select("<script>" +
-            "select sum(TOTAL_COUNT) PLASTIC_FILM_TYPE1 from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and PLASTIC_FILM_TYPE=2"+
+            "select sum(TOTAL_COUNT) PLASTIC_FILM_TYPE1 from plastic_film where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and PLASTIC_FILM_TYPE=2" +
             "<if test='name != null '>" +
             " and name =#{name} " +
             "</if>" +
             "<if test='typeCode != 0 '>" +
-            " and typeCode =#{typeCode} " +
+            " and PLASTIC_FILM_TYPE =#{typeCode} " +
             "</if>" +
             "</script>")
-    public String selectFilmCount2(@Param("beginDate") String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name);
+    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);
+    public boolean insertCardBody(@Param("cardType") String cardType, @Param("totalCount") String totalCount, @Param("note") String note, @Param("name") String name);
 
 
     @Select("<script>" +
-            "select * from CARD_BODY where to_char(SAVE_DATE,'yyyyMMdd') between #{beginDate} and #{endDate}"+
+            "select * from CARD_BODY where to_char(SAVE_DATE,'yyyyMMdd') between #{beginDate} and #{endDate}" +
             "<if test='name != null '>" +
             " and name =#{name} " +
             "</if>" +
             "<if test='typeCode != 0 '>" +
-            " and typeCode =#{typeCode} " +
+            " and card_type =#{typeCode} " +
             "</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);
 
     @Select("<script>" +
-            "select sum(TOTAL_COUNT) cardType1 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=1"+
+            "select sum(TOTAL_COUNT) cardType1 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=1" +
             "<if test='name != null '>" +
             " and name =#{name} " +
             "</if>" +
             "<if test='typeCode != 0 '>" +
-            " and typeCode =#{typeCode} " +
+            " and card_type =#{typeCode} " +
             "</if>" +
             "</script>")
-    public String selectCardCount1(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name);
+    public String selectCardCount1(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
 
     @Select("<script>" +
-            "select sum(TOTAL_COUNT) cardType2 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=2"+
+            "select sum(TOTAL_COUNT) cardType2 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=2" +
             "<if test='name != null '>" +
             " and name =#{name} " +
             "</if>" +
             "<if test='typeCode != 0 '>" +
-            " and typeCode =#{typeCode} " +
+            " and card_type =#{typeCode} " +
             "</if>" +
             "</script>")
-    public String selectCardCount2(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name);
+    public String selectCardCount2(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
 
 }

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

@@ -34,7 +34,7 @@ public interface PersonPostMapper {
             "SELECT * FROM " +
             "( " +
             "SELECT A.*, ROWNUM RN " +
-            " from (SELECT PERSON_POST.*" +
+            " from (SELECT DISTINCT PERSON_POST.*" +
             " FROM PERSON_POST " +
             " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " +
             " left join PREPRO_PERSON  on PERSON_POST.first_white = prepro_person.jmsfzslh " +
@@ -44,14 +44,12 @@ public interface PersonPostMapper {
             " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=${orderNumber} </when>" +
             " <if test='state== 0 '> and  PERSON_POST.print_date is null  </if>" +
             " <if test='state== 1 '> and  PERSON_POST.print_date is not null  </if>" +
-//            " <if test='notNull== 1 '> and  (PERSON_POST.ID_CARD is not null ) or  (PERSON_POST.ACCEPT_THE_MATTER is not null ) or (PERSON_POST.BEGIN_USEFUL_LIFE is not null ) or (PERSON_POST.VALID_PERIOD_END is not null ) </if>" +
-//            " <if test='notNull== 0 '> and  (PERSON_POST.ID_CARD is null) or  (PERSON_POST.ACCEPT_THE_MATTER is null) or (PERSON_POST.BEGIN_USEFUL_LIFE is null) or (PERSON_POST.VALID_PERIOD_END is null) </if>" +
             " <if test='notNull== 1 '> and PREPRO_PERSON.JMSFZSLH is not null </if>" +
             " <if test='notNull== 0 '> and PREPRO_PERSON.JMSFZSLH is  null  </if>" +
             " <when test='latticeMouthInformation!=\"\"'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=${latticeMouthInformation} </when>" +
             " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY  in ( ${getToCounty} ) </when>" +
             " <when test='uploadDate!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=${uploadDate} </when>" +
-            ") " +
+            "order by PERSON_POST.id ) " +
             "A"  +
             ")"  +
             "WHERE RN BETWEEN ${pageSize} AND ${firstIndex}" +
@@ -60,7 +58,7 @@ public interface PersonPostMapper {
 
 
     @Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where ID=#{id}")
-    public Map<String,Object>selectNote(@Param("id")int id);
+    public List<Map<String,Object>> selectNote(@Param("id")int id);
 
 
     @Update("UPDATE PERSON_POST SET NOTE = #{note} where ID = #{id}")

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

@@ -229,7 +229,7 @@ public interface ReceiptMapper {
     @Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate}  and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_ID=${type} and receipt_date is null")
     public boolean updateReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("string") String string,@Param("type") long type);
 
-    @Select("select RECEIPT_LIST.POLICE_CODE,sum(RECEIPT_LIST.FINISH_COUNT),GAJG_DM.GAJG_MC from RECEIPT_LIST \n" +
+    @Select("select RECEIPT_LIST.POLICE_CODE,sum(RECEIPT_LIST.FINISH_COUNT) FINISH_COUNT,GAJG_DM.GAJG_MC from RECEIPT_LIST \n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
             "where CHECK_NAME = #{name} and  to_char(CHECK_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
             "group by RECEIPT_LIST.POLICE_CODE, GAJG_DM.GAJG_MC")

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

@@ -1501,6 +1501,8 @@ public interface TaskListMapper {
             "group by CARD_TYPE, CARD_TYPE_ID, failed_count, PUNCHING_DATE")
     public List<Map<String, Object>> selectWorkGroupReport(@Param("startDate")String startDate,@Param("endDate") String endDate,@Param("workGroup") String workGroup);
 
+    @Update("update task set work_group = ${workGroup} where TASK_ID = ${taskId}")
+    public boolean updateWorkGroup(@Param("taskId")String taskId,@Param("workGroup") long workGroup);
 
 
 

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

 package com.yxproject.start.service;
 
 import com.yxproject.start.entity.DeliveredFailedInfoEntity;
+import com.yxproject.start.entity.DeliveredFailedReasonEntity;
 import com.yxproject.start.entity.DeliveredImportDicEntity;
 import com.yxproject.start.entity.DeliveredInfoEntity;
 
@@ -20,4 +21,5 @@ public interface DeliveredService {
     public List<Map<String,Object>> selectDeliveredFailedByRegisterDate(String date);
     public boolean deleteDeliveredByFileId(long filedID);
     public boolean deleteDeliveredFailedById(long id);
+    public List<DeliveredFailedReasonEntity> selectDeliveredFailedType();
 }

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

@@ -100,4 +100,5 @@ public interface TaskListService {
 
     public List<Map<String,Object>> selectWorkGroupReport(String startDate,String endDate,String workGroup);
 
+    public boolean updateWorkGroup(List<String> list,String workGroup);
 }

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

 package com.yxproject.start.service.impl;
 
 import com.yxproject.start.entity.DeliveredFailedInfoEntity;
+import com.yxproject.start.entity.DeliveredFailedReasonEntity;
 import com.yxproject.start.entity.DeliveredImportDicEntity;
 import com.yxproject.start.entity.DeliveredInfoEntity;
 import com.yxproject.start.mapper.DeliveredFailedInfoMapper;
@@ -79,4 +80,10 @@ public class DeliveredServiceImpl implements DeliveredService {
     public boolean deleteDeliveredFailedById(long id) {
         return deliveredInfoMapper.deleteDeliveredFailedById(id);
     }
+
+
+    @Override
+    public List<DeliveredFailedReasonEntity> selectDeliveredFailedType() {
+        return deliveredInfoMapper.selectDeliveredFailedType();
+    }
 }

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

@@ -135,8 +135,8 @@ public class PersonPostServiceImpl implements PersonPostService {
 
     @Override
     public Map<String, Object> selectNote(int id) {
-        Map<String, Object> resultMap = personPostMapper.selectNote(id);
-        return resultMap;
+        List<Map<String, Object>> maps = personPostMapper.selectNote(id);
+        return maps.get(0);
     }
 
     @Override

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

@@ -955,6 +955,15 @@ public class TaskListServiceImpl implements TaskListService {
         return taskListMapper.getPrintOutCount();
     }
 
+    @Override
+    @Transactional
+    public boolean updateWorkGroup(List<String> list, String workGroup) {
+        for (String taskId:list){
+            taskListMapper.updateWorkGroup(taskId,Long.valueOf(workGroup));
+        }
+        return true;
+    }
+
     private String createGroupNo(List<Integer> c, List<Integer> nsList) {
         try {
             String groupNo = "";

src/main/resources/static/index.html

@@ -184,6 +184,7 @@
 <script src="views/tagPrint/tagPrint.js"></script>
 <script src="views/addTag/addTag.js"></script>
 <script src="views/autoCheck/autoCheck.js"></script>
+<script src="views/materialManagement/materialManagement.js"></script>
 <script src="views/queryWorkGroupReport/queryWorkGroupReport.js"></script>
 <script src="views/querySortingReport/querySortingReport.js"></script>
 <script src="views/queryQualityCheckReport/queryQualityCheckReport.js"></script>

src/main/resources/static/js/app.js

@@ -24,6 +24,7 @@ angular.module('AvatarCheck', [
     'AvatarCheck.analysisLog',
     'AvatarCheck.packageLog',
     'AvatarCheck.tagPrint',
+    'AvatarCheck.materialManagement',
     'tm.pagination',
     'AvatarCheck.addTag',
     'AvatarCheck.autoCheck',
@@ -161,6 +162,9 @@ angular.module('AvatarCheck', [
         if($location.path()=="/autoCheck"){
             $rootScope.tab = '/autoCheck';
         }
+        if($location.path()=="/materialManagement"){
+            $rootScope.tab = '/materialManagement';
+        }
         if($location.path()=="/queryWorkGroupReport"){
             $rootScope.tab = '/queryWorkGroupReport';
         }

src/main/resources/static/js/service.js

@@ -575,6 +575,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
+            updateWorkGroup:function(data,success){
+                var body = JSON.stringify(data);
+                console.log("data:",body)
+                $http({
+                    method: 'POST',
+                    url: "../TaskList/updateWorkGroup",
+                    data: body,
+                    headers: {'Content-Type': 'application/json'}
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
             getFjHistoryTask:function(date,success){
                 console.log(date)
                 $http({

src/main/resources/static/views/materialManagement/materialManagement.html

+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
+        <div class="row">
+            <!-- /.col -->
+            <div class="col-md-12">
+                <div class="box box-primary" >
+                    <div class="box-header">
+                        <strong ng-if="state==2">膜打印数据报表</strong>
+                        <strong ng-if="state==3">耗材管理</strong>
+                        <div class="box-tools pull-right">
+                            <span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/>  <span>至</span>
+                            <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate2" id="datepicker2" readonly/>
+                            <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchReport()">查询</button>
+                        </div>
+                        <!-- /.box-tools -->
+                    </div>
+                    <!-- /.box-header -->
+                    <div class="box-body">
+                        <div ng-if="reportData.length==1">
+                            <h4>暂无数据</h4>
+                        </div>
+
+                        <div ng-if="reportData.length>1">
+
+                            <div  class="table-responsive mailbox-messages" >
+                                <div class="mailbox-messages">
+                                    <table class="table table-hover postTable">
+                                        <thead>
+                                        <tr>
+                                            <th ng-if="2">打印日期</th>
+                                            <th ng-if="3">预定位日期</th>
+                                            <th>大批证</th>
+                                            <th>邮寄证</th>
+                                            <th>军人证</th>
+                                            <th>快证</th>
+                                            <th>废证</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody ng-repeat="item in reportData">
+                                        <tr style="background-color: #eee">
+                                            <td>{{item.date}}</td>
+                                            <td style="color: #3c8dbc">{{item.pu}}</td>
+                                            <td>{{item.you}}</td>
+                                            <td>{{item.jun}}</td>
+                                            <td>{{item.kuai}}</td>
+                                            <td>{{item.fei}}</td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <!-- /.table -->
+                                </div>
+                                <!-- /.table -->
+                            </div>
+                        </div>
+                        <!-- /.mail-box-messages -->
+                    </div>
+                    <!-- /.box-body -->
+                </div>
+                <!-- /. box -->
+            </div>
+            <!-- /.col -->
+        </div>
+        <!-- /.row -->
+    </div>
+</div>
+

src/main/resources/static/views/materialManagement/materialManagement.js

+'use strict';
+
+angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http'])
+    .config(['$routeProvider', function ($routeProvider) {
+        $routeProvider.when('/materialManagement', {
+            templateUrl: 'views/materialManagement/materialManagement.html' + urlTimeStamp(),
+            controller: 'materialManagementCtrl',
+            cache: false
+        });
+    }])
+
+    .controller('materialManagementCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
+        $scope.state = 3;
+        //Date picker
+        $('#datepicker1').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $('#datepicker2').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
+        $scope.choseDate2 = $filter("date")(new Date(), "yyyy-MM-dd");
+
+
+        $scope.searchReport = function () {
+            var date1=$('#datepicker1').val();
+            var date2=$('#datepicker2').val();
+            if(date1==''){
+                date1= $filter("date")(new Date(), "yyyy-MM-dd");
+            }
+            if(date2==''){
+                date2= $filter("date")(new Date(), "yyyy-MM-dd");
+            }
+            HttpService.getReport(date1,date2,function(data){
+                $scope.reportData=data;
+            })
+        }
+        $scope.searchReport();
+
+
+    });
\ No newline at end of file

src/main/resources/static/views/receitp/receitp.html

@@ -147,7 +147,7 @@
   </div>
 </div>
 </div>
-<div id="divPrint">
+<div id="divPrint{{$index}}" ng-repeat="idx in result">
         <div class="title" style="text-align: center;">
             北京市公安局证件制作管理中心交接岗位<br />
             身份证交接单</div>
@@ -174,9 +174,9 @@
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in receitpDataToPrint.list">
+                <tr ng-repeat="item in idx">
                     <td width="60">
-                        {{$index+1}}
+                        {{item.id}}
                     </td>
                     <td width="130">
                         {{item.QR_CODE}}
@@ -193,7 +193,7 @@
                 </tr>
             </tbody>
             <tfoot>
-                <tr>
+                <tr ng-if="$index==result.length-1">
                     <td colspan="2" class="center">
                         合计
                     </td>

src/main/resources/static/views/receitp/receitp.js

@@ -128,19 +128,25 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
                 list:[]
             }
             var checks = $(".checkAllPolice:checked");
-            if(checks.length>37){
-                $scope.chooseCount = checks.length;
-                MessageService.showAlert("一张纸上只能显示37条数据，本次已选择"+$scope.chooseCount+"条，请去掉"+37-$scope.chooseCount+"条数据再打印")
-            }else{
-                for (var i=0;i<checks.length;i++){
-                    for(var j=0;j<JSON.parse(checks[i].value).length;j++){
-                        json.list.push(JSON.parse(checks[i].value)[j].POLICE_CODE)
-                    }
+
+            for (var i=0;i<checks.length;i++){
+                for(var j=0;j<JSON.parse(checks[i].value).length;j++){
+                    json.list.push(JSON.parse(checks[i].value)[j].POLICE_CODE)
+                }
+            }
+            console.log(json)
+            HttpService.printReceitpData(json,function (data) {
+                $scope.receitpDataToPrint = data;
+                for (var i=0;i<$scope.receitpDataToPrint.list.length;i++){
+                    $scope.receitpDataToPrint.list[i].id = i+1
                 }
-                console.log(json)
-                HttpService.printReceitpData(json,function (data) {
-                    $scope.receitpDataToPrint = data;
-                    $timeout(function () {
+                $scope.result = [];
+                for(var i=0;i<$scope.receitpDataToPrint.list.length;i+=37){
+                    $scope.result.push($scope.receitpDataToPrint.list.slice(i,i+37));
+                }
+                console.log($scope.result)
+                $timeout(function () {
+                    for (var i=0;i<$scope.result.length;i++){
                         var LODOP = getLodop();
                         LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
                         //初始化
@@ -162,15 +168,15 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
                         LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
                         LODOP.SET_PRINT_STYLEA(0, "Alignment", 1);
                         LODOP.SET_PRINT_STYLEA(0, "FontSize", 12);
-                        LODOP.ADD_PRINT_TABLE(110, 3, 740, "100%", document.getElementById("divPrint").innerHTML);
+                        LODOP.ADD_PRINT_TABLE(110, 3, 740, "100%", document.getElementById("divPrint"+i).innerHTML);
                         LODOP.SET_PRINT_STYLEA(0, "HOrient", 2);
                         LODOP.SET_PRINT_STYLEA(0, "Vorient", 3);
                         LODOP.SET_PRINTER_INDEXA(-1);
-                        LODOP.PREVIEW();
-                        // LODOP.PRINT();
-                    })
+                        // LODOP.PREVIEW();
+                        LODOP.PRINT();
+                    }
                 })
-            }
+            })
 
 
         }

src/main/resources/static/views/report/report.html

@@ -5,8 +5,7 @@
             <div class="col-md-12">
                 <div class="box box-primary" >
                     <div class="box-header">
-                        <strong ng-if="state==2">膜打印数据报表</strong>
-                        <strong ng-if="state==3">工作组数据报表</strong>
+                        <strong>膜打印数据报表</strong>
                         <div class="box-tools pull-right">
                             <span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/>  <span>至</span>
                             <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate2" id="datepicker2" readonly/>
@@ -27,8 +26,7 @@
                                     <table class="table table-hover postTable">
                                         <thead>
                                         <tr>
-                                            <th ng-if="state==2">打印日期</th>
-                                            <th ng-if="state==3">预定位日期</th>
+                                            <th>打印日期</th>
                                             <th>大批证</th>
                                             <th>邮寄证</th>
                                             <th>军人证</th>

src/main/resources/static/views/report/report.js

@@ -10,7 +10,6 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
     }])
 
     .controller('reportCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
-        $scope.state = 3;
         //Date picker
         $('#datepicker1').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
@@ -41,6 +40,7 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
             }
             HttpService.getReport(date1,date2,function(data){
                 $scope.reportData=data;
+                console.log($scope.reportData)
             })
         }
         $scope.searchReport();

src/main/resources/static/views/task/task.js

@@ -176,6 +176,34 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
 
         }
 
+        $scope.groupList = [
+            {
+                id:1,
+                name:'A组'
+            },
+            {
+                id:2,
+                name:'B组'
+            }
+        ]
+        $scope.updateGroup = function() {
+            var groupSelected = $("#groupSelected").val();
+            console.log(groupSelected)
+            var checks = $("#checkOneBox:checked");
+            var arr = [];
+            for (var i=0;i<checks.length;i++){
+                arr.push(checks[i].value)
+            }
+            var json = {
+                workGroup:groupSelected,
+                taskIdList:arr
+            }
+            HttpService.updateWorkGroup(json,function(data) {
+                console.log(data)
+                $scope.searchTaskList();
+            })
+        }
+
         $scope.goes = function(){
             $rootScope.selectCount = 0;
             for (var i = 0; i < $scope.selected.length; i++) {

src/main/resources/static/views/task/taskListPrint.html

@@ -100,6 +100,14 @@
                 </table>
                 <!-- /.table -->
                 <div class="box-footer">
+                    <div class="pull-left">
+                        <select class="form-control select2" id="groupSelected" style="border-radius:5px">
+                            <option value="{{group.id}}" ng-repeat="group in groupList">{{group.name}}</option>
+                        </select>
+                    </div>
+                    <div class="pull-left" style="margin-left: 10px;">
+                        <button class="btn btn-info" ng-click="updateGroup()">更新工作组</button>
+                    </div>
                     <div class="pull-right" style="margin-left: 10px;">
                         <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
                     </div>