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

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

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

@@ -237,7 +237,6 @@ public class AdminApi {
         String str = "0";
         SysPermission sysPermission = new SysPermission();
         sysPermission.setName(jsonObject.getString("name"));
-        sysPermission.setResource_type(jsonObject.getString("resourceType"));
         sysPermission.setUrl(jsonObject.getString("url"));
         sysPermission.setPermission(jsonObject.getString("permission"));
 //        sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId")));
@@ -335,6 +334,7 @@ public class AdminApi {
         SysRole sysRole = new SysRole();
         sysRole.setRole(jsonObject.getString("role"));
         sysRole.setDescription(jsonObject.getString("description"));
+        sysRole.setProcess(Integer.parseInt(jsonObject.getString("process")));
         String permissionIds = jsonObject.getString("permissionIds");
 
         JSONArray jsonArray = JSONArray.fromObject(permissionIds);
@@ -402,19 +402,11 @@ public class AdminApi {
         JSONObject jsonObject = JSONObject.fromObject(jsonStr);
         Map<String, String> map = new HashMap<>();
         boolean flag = false;
-//        String str = "0";
         SysPermission sysPermission = new SysPermission();
         sysPermission.setId(Integer.parseInt(jsonObject.getString("id")));
         sysPermission.setName(jsonObject.getString("name"));
-        sysPermission.setResource_type(jsonObject.getString("resourceType"));
         sysPermission.setUrl(jsonObject.getString("url"));
         sysPermission.setPermission(jsonObject.getString("permission"));
-//        sysPermission.setParent_id(Long.parseLong(parentId));
-//        if(parentId.equals(str)){
-//            sysPermission.setParent_ids(parentId+"/");
-//        }else{
-//            sysPermission.setParent_ids(str+"/"+parentId);
-//        }
         System.out.println(sysPermission);
         flag = sysPermissionService.updatePermission(sysPermission);
         if (flag) {
@@ -426,4 +418,4 @@ public class AdminApi {
         return map;
 
     }
- }
+}

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

@@ -22,13 +22,8 @@ import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import javax.xml.crypto.Data;
 import java.io.File;
 import java.io.IOException;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -51,10 +46,7 @@ public class ReadExcelApi {
     @Produces(MediaType.APPLICATION_JSON)
     @Transactional(rollbackFor = Exception.class)
     public boolean ReadPersonPost(HttpServletResponse resp, HttpServletRequest requ) {
-
-        System.out.println("进入api");
         YXJSONResponse yxresp = new YXJSONResponse();
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         resp.setCharacterEncoding("UTF-8");
         String filename = "";
         DiskFileItemFactory factory = new DiskFileItemFactory();

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

@@ -70,7 +70,7 @@ public class ReadXmlApi {
             //将当前上下文初始化给  CommonsMutipartResolver （多部分解析器）
             CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
                     requ.getSession().getServletContext());
-// 判断是否是多数据段提交格式
+            // 判断是否是多数据段提交格式
             if (multipartResolver.isMultipart(requ)) {
                 MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
                 Iterator<String> iter = multiRequest.getFileNames();
@@ -79,7 +79,7 @@ public class ReadXmlApi {
                     try {
                         // 如果fileitem中封装的是普通输入项的数据
                         // 如果fileitem中封装的是上传文件
-                        // 得到上传的文件名称，
+                        // 得到上传的文件名称
                         filename = item.getName();
                         if (filename == null || filename.trim().equals("")) {
                             continue;

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

 package com.yxproject.start.api;
 
-import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
-import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
-import com.yxproject.start.entity.resp.SelectByIdcardEntity;
-import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
+import com.yxproject.start.entity.resp.*;
 import com.yxproject.start.service.SelectSerialNumberService;
 import com.yxproject.start.utils.YXJSONResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +21,8 @@ import java.util.Map;
 @RequestMapping("specialCardInfo")
 public class SelectApi {
     /**
-     * 根据 组号、受理号、身份证号、任务单号查询
+     * 根据 组号8、受理号10、身份证号18、任务单号查询11
+     *
      */
     @Autowired
     private SelectSerialNumberService selectSerialNumberService;
@@ -32,54 +30,65 @@ public class SelectApi {
     @RequestMapping(value = "selectByCard")
     public String  selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
         resp.setCharacterEncoding("UTF-8");
-        List<String> list = new ArrayList<>();
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        /*任务单*/
+        Map<String,Object> taskListMap = new HashMap<>();
+        /*受理库*/
+        Map<String,Object> acceptMap = new HashMap<>();
+        /*制证库*/
+        Map<String,Object> accreditationMap = new HashMap<>();
+
         Map<String, Object> map = new HashMap<>();
 
         if (id.length() ==11){
-            try {
-                SelectByWorkOrderEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
-                map.put("searchResult",specialCardInfo4);
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-
+            SelectFromTaskListEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderFromYX(id);
+                taskListMap.put("workOrderDate",specialCardInfo4);
+                resultList.add(taskListMap);
+                resultList.add(acceptMap);
+                resultList.add(accreditationMap);
         }else {
             switch (id.length()) {
                 case 8:
-                    try {
-                        SelectByGroupNumEntity specialCardInfo = selectSerialNumberService.selectByGroupNumberFromACC(id);
-                        if (specialCardInfo.getGroup_No()!=null&specialCardInfo.getGroup_No()!=""){
-                            map.put("searchResult", specialCardInfo);
-                        }else {
-                            SelectByGroupNumEntity selectResulr = selectSerialNumberService.selectByGroupNumberFromYX(id);
-
-                        }
-
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
+                    SelectFromTaskListEntity specialCardInfo = selectSerialNumberService.selectByGroupNoFromYX(id);
+                    SelectFromProdEntity selectResult = selectSerialNumberService.selectByGroupNoFromProd(id);
+                    SelectFromAccEntity specialCardInfo4 = selectSerialNumberService.selectByGroupNoFromAcc(id);
+                    taskListMap.put("yxData",specialCardInfo);
+                    accreditationMap.put("prodData",selectResult);
+                    acceptMap.put("accData",specialCardInfo4);
+                    resultList.add(taskListMap);
+                    resultList.add(accreditationMap);
+                    resultList.add(acceptMap);
                     break;
                 case 10:
-                    try {
-                        SelectByAcceptedEntity specialCardInfo2 = selectSerialNumberService.selectByAccepted(id);
-                        map.put("searchResult", specialCardInfo2);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
+                    SelectFromTaskListEntity specialCardInfo2 = selectSerialNumberService.selectByAcceptFromYX(id);
+                    SelectFromProdEntity selectResult2 = selectSerialNumberService.selectByAcceptFromProd(id);
+                    SelectFromAccEntity specialCardInfo5 = selectSerialNumberService.selectByAcceptFromAcc(id);
+                    taskListMap.put("yxData",specialCardInfo2);
+                    accreditationMap.put("prodData",selectResult2);
+                    acceptMap.put("accData",specialCardInfo5);
+                    resultList.add(taskListMap);
+                    resultList.add(accreditationMap);
+                    resultList.add(acceptMap);
+
                     break;
                 case 18:
-                    try {
-                        SelectByIdcardEntity specialCardInfo3 = selectSerialNumberService.selectByIdCard(id);
-                        map.put("searchResult", specialCardInfo3);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
+
+                    SelectFromTaskListEntity specialCardInfo3 = selectSerialNumberService.selectByCardIdFromYX(id);
+                    SelectFromProdEntity selectResult3 = selectSerialNumberService.selectByCardIdFromProd(id);
+                    SelectFromAccEntity specialCardInfo6 = selectSerialNumberService.selectByCardIdFromAcc(id);
+                    taskListMap.put("yxData",specialCardInfo3);
+                    accreditationMap.put("prodData",selectResult3);
+                    acceptMap.put("accData",specialCardInfo6);
+                    resultList.add(taskListMap);
+                    resultList.add(accreditationMap);
+                    resultList.add(acceptMap);
+
                     break;
             }
         }
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(map);
+        yxjsonResponse.outPutSuccess(resultList);
         return yxjsonResponse.toJSONString();
 
     }

src/main/java/com/yxproject/start/api/fakeApi/PackageInformationApi.java

@@ -88,7 +88,6 @@ public class PackageInformationApi {
         jsonStr7.put("cardType ","普通证");
         list.add(jsonStr7);
 
-
         map.put("commonCardCount",2300);
         map.put("postCardCount",1200);
         map.put("forbiddenCount",2);

src/main/java/com/yxproject/start/api/fakeApi/SelectExcelApi.java

@@ -117,8 +117,6 @@ public class SelectExcelApi {
         countyList.add(jsonStr10);
         countyList.add(jsonStr11);
 
-
-
         return countyList.toString();
 
     }

src/main/java/com/yxproject/start/api/fakeApi/SortingGroupListApi.java

@@ -18,7 +18,7 @@ public class SortingGroupListApi {
      * @return
      */
     @RequestMapping("sortingGroupList")
-    public String sortingGroupList(@Param("readXMLDate")String readXMLDate,@Param("state")String state){
+    public List<JSONObject> sortingGroupList(@Param("readXMLDate")String readXMLDate,@Param("state")String state){
 
         List<JSONObject> countyList = new ArrayList<>();
         JSONObject jsonStr1 = new JSONObject();
@@ -69,7 +69,7 @@ public class SortingGroupListApi {
         jsonStr6.put("postCardCount",13000);
         countyList.add(jsonStr6);
 
-        return countyList.toString();
+        return countyList;
 
     }
 }

src/main/java/com/yxproject/start/api/fakeApi/TaskListFakeApi.java

@@ -4,7 +4,6 @@ import net.sf.json.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -19,9 +18,9 @@ public class TaskListFakeApi {
      * @return
      */
     @RequestMapping("selectByDate")
-    public String selectByDate(@Param("date") String date){
+    public List<Map> selectByDate(@Param("date") String date){
 
-        List<String> result = new ArrayList<>();
+        List<Map> result = new ArrayList<>();
         Map<String,Object> map1 = new HashMap<>();
         Map<String,Object> map2 = new HashMap<>();
 
@@ -91,11 +90,11 @@ public class TaskListFakeApi {
         map2.put("list",list2);
 
 
-        result.add(map1.toString());
-        result.add(map2.toString());
+        result.add(map1);
+        result.add(map2);
 
 
 
-        return result.toString();
+        return result;
     }
 }

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

+package com.yxproject.start.entity;
+
+import javax.persistence.Entity;
+
+public class CountDataEntity {
+    private String uploadDate;
+    private Integer packageCount;
+    private Integer cardCount;
+    private Integer commonCardCount;
+    private Integer postCardCount;
+
+    public String getUploadDate() {
+        return uploadDate;
+    }
+
+    public void setUploadDate(String uploadDate) {
+        this.uploadDate = uploadDate;
+    }
+
+    public Integer getPackageCount() {
+        return packageCount;
+    }
+
+    public void setPackageCount(Integer packageCount) {
+        this.packageCount = packageCount;
+    }
+
+    public Integer getCardCount() {
+        return cardCount;
+    }
+
+    public void setCardCount(Integer cardCount) {
+        this.cardCount = cardCount;
+    }
+
+    public Integer getCommonCardCount() {
+        return commonCardCount;
+    }
+
+    public void setCommonCardCount(Integer commonCardCount) {
+        this.commonCardCount = commonCardCount;
+    }
+
+    public Integer getPostCardCount() {
+        return postCardCount;
+    }
+
+    public void setPostCardCount(Integer postCardCount) {
+        this.postCardCount = postCardCount;
+    }
+}

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+import java.util.Objects;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/4   18:45
+ */
+@Entity
+@Table(name = "NEW_FILES", schema = "YINGXIN", catalog = "")
+public class NewFilesEntity {
+    private String versionCode;
+    private String dwdm;
+    private String dwmc;
+    private Long recordNumber;
+    private String createDate;
+    private String newFileName;
+    private String newTime;
+    private long id;
+
+    @Basic
+    @Column(name = "VERSION_CODE")
+    public String getVersionCode() {
+        return versionCode;
+    }
+
+    public void setVersionCode(String versionCode) {
+        this.versionCode = versionCode;
+    }
+
+    @Basic
+    @Column(name = "DWDM")
+    public String getDwdm() {
+        return dwdm;
+    }
+
+    public void setDwdm(String dwdm) {
+        this.dwdm = dwdm;
+    }
+
+    @Basic
+    @Column(name = "DWMC")
+    public String getDwmc() {
+        return dwmc;
+    }
+
+    public void setDwmc(String dwmc) {
+        this.dwmc = dwmc;
+    }
+
+    @Basic
+    @Column(name = "RECORD_NUMBER")
+    public Long getRecordNumber() {
+        return recordNumber;
+    }
+
+    public void setRecordNumber(Long recordNumber) {
+        this.recordNumber = recordNumber;
+    }
+
+    @Basic
+    @Column(name = "CREATE_DATE")
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    @Basic
+    @Column(name = "NEW_FILE_NAME")
+    public String getNewFileName() {
+        return newFileName;
+    }
+
+    public void setNewFileName(String newFileName) {
+        this.newFileName = newFileName;
+    }
+
+    @Basic
+    @Column(name = "NEW_TIME")
+    public String getNewTime() {
+        return newTime;
+    }
+
+    public void setNewTime(String newTime) {
+        this.newTime = newTime;
+    }
+
+    @Id
+    @Column(name = "ID")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        NewFilesEntity that = (NewFilesEntity) o;
+        return id == that.id &&
+                Objects.equals(versionCode, that.versionCode) &&
+                Objects.equals(dwdm, that.dwdm) &&
+                Objects.equals(dwmc, that.dwmc) &&
+                Objects.equals(recordNumber, that.recordNumber) &&
+                Objects.equals(createDate, that.createDate) &&
+                Objects.equals(newFileName, that.newFileName) &&
+                Objects.equals(newTime, that.newTime);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(versionCode, dwdm, dwmc, recordNumber, createDate, newFileName, newTime, id);
+    }
+}

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

@@ -3,6 +3,10 @@ package com.yxproject.start.entity;
 import javax.persistence.*;
 import java.util.Objects;
 
+/**
+ * @auther zhangyusheng
+ * 2019/3/4   20:09
+ */
 @Entity
 @Table(name = "PREPRO_PERSON", schema = "YINGXIN", catalog = "")
 public class PreproPersonEntity {
@@ -30,9 +34,9 @@ public class PreproPersonEntity {
     private String sjrYzbm;
     private String sjrTxdz;
     private String sid;
-    private String fileName;
+    private Long fileId;
     private Long cardTypeId;
-    private String newFileName;
+    private Long newFileId;
     private Long state;
 
     @Id
@@ -276,13 +280,13 @@ public class PreproPersonEntity {
     }
 
     @Basic
-    @Column(name = "FILE_NAME")
-    public String getFileName() {
-        return fileName;
+    @Column(name = "FILE_ID")
+    public Long getFileId() {
+        return fileId;
     }
 
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
+    public void setFileId(Long fileId) {
+        this.fileId = fileId;
     }
 
     @Basic
@@ -296,13 +300,13 @@ public class PreproPersonEntity {
     }
 
     @Basic
-    @Column(name = "NEW_FILE_NAME")
-    public String getNewFileName() {
-        return newFileName;
+    @Column(name = "NEW_FILE_ID")
+    public Long getNewFileId() {
+        return newFileId;
     }
 
-    public void setNewFileName(String newFileName) {
-        this.newFileName = newFileName;
+    public void setNewFileId(Long newFileId) {
+        this.newFileId = newFileId;
     }
 
     @Basic
@@ -344,14 +348,14 @@ public class PreproPersonEntity {
                 Objects.equals(sjrYzbm, that.sjrYzbm) &&
                 Objects.equals(sjrTxdz, that.sjrTxdz) &&
                 Objects.equals(sid, that.sid) &&
-                Objects.equals(fileName, that.fileName) &&
+                Objects.equals(fileId, that.fileId) &&
                 Objects.equals(cardTypeId, that.cardTypeId) &&
-                Objects.equals(newFileName, that.newFileName) &&
+                Objects.equals(newFileId, that.newFileId) &&
                 Objects.equals(state, that.state);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileName, cardTypeId, newFileName, state);
+        return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileId, cardTypeId, newFileId, state);
     }
 }

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

@@ -5,7 +5,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @author zhangyusheng
+ * @author liboyang
  */
 @Entity
 @Table(name="SYS_PERMISSION")
@@ -20,10 +20,7 @@ public class SysPermission implements Serializable {
      * 名称.
      */
     private String name;
-    /**
-     * 资源类型
-     */
-    private String resource_type;
+
     /**
      * 资源路径.
      */
@@ -33,19 +30,6 @@ public class SysPermission implements Serializable {
      */
     private String permission;
 
-
-
-    /**
-     * 父编号
-     */
-    private Long parent_id;
-
-
-
-    /**
-     * 父编号列表
-     */
-    private String parent_ids;
     private byte available = 0;
     @ManyToMany
     @JoinTable(name="SysRolePermission",joinColumns={@JoinColumn(name="permissionId")},inverseJoinColumns={@JoinColumn(name="roleId")})
@@ -67,22 +51,6 @@ public class SysPermission implements Serializable {
         this.name = name;
     }
 
-    public String getResource_type() {
-        return resource_type;
-    }
-
-    public void setResource_type(String resource_type) {
-        this.resource_type = resource_type;
-    }
-
-    public String getParent_ids() {
-        return parent_ids;
-    }
-
-    public void setParent_ids(String parent_ids) {
-        this.parent_ids = parent_ids;
-    }
-
     public String getUrl() {
         return url;
     }
@@ -99,16 +67,6 @@ public class SysPermission implements Serializable {
         this.permission = permission;
     }
 
-    public Long getParent_id() {
-        return parent_id;
-    }
-
-    public void setParent_id(Long parent_id) {
-        this.parent_id = parent_id;
-    }
-
-
-
     public byte getAvailable() {
         return available;
     }

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

@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.List;
 
 /**
- * @author zhangyusheng
+ * @author liboyang
  */
 @Entity
 @Table(name="SYS_ROLE")
@@ -28,6 +28,8 @@ public class SysRole {
      */
     private byte available = 0;
 
+    private Integer process;
+
     /**
      * 角色 -- 权限关系：多对多关系;
      */
@@ -94,4 +96,12 @@ public class SysRole {
     public void setUserInfos(List<UserInfo> userInfos) {
         this.userInfos = userInfos;
     }
+
+    public Integer getProcess() {
+        return process;
+    }
+
+    public void setProcess(Integer process) {
+        this.process = process;
+    }
 }
\ No newline at end of file

src/main/java/com/yxproject/start/entity/TaskList/CountCountyEntity.java

 package com.yxproject.start.entity.TaskList;
 
+import org.springframework.stereotype.Component;
+
+@Component
 public class CountCountyEntity {
     private String countyName;
     private Integer countyCount;

src/main/java/com/yxproject/start/entity/TaskList/CountGajgEntity.java

 package com.yxproject.start.entity.TaskList;
 
+import org.springframework.stereotype.Component;
+
+@Component
 public class CountGajgEntity {
     private String gajgName;
     private Integer gajgCount;

src/main/java/com/yxproject/start/entity/TaskList/TaskListEntity.java

 package com.yxproject.start.entity.TaskList;
 
+import org.springframework.stereotype.Component;
+
+@Component
 public class    TaskListEntity {
     private String countyName;
     private String gajgName;

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

@@ -5,7 +5,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @author zhangyusheng
+ * @author liboyang
  */
 @Entity
 @Table(name="USER_INFO")
@@ -19,7 +19,6 @@ public class UserInfo implements Serializable {
     private String password;
     private String salt;
     private byte state;
-    private String workshop;
     @ManyToMany(fetch= FetchType.EAGER)
     @JoinTable(name = "SysUserRole", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns ={@JoinColumn(name = "roleId") })
     private List<SysRole> roleList;
@@ -80,11 +79,4 @@ public class UserInfo implements Serializable {
         this.roleList = roleList;
     }
 
-    public String getWorkshop() {
-        return workshop;
-    }
-
-    public void setWorkshop(String workshop) {
-        this.workshop = workshop;
-    }
 }
\ No newline at end of file

src/main/java/com/yxproject/start/entity/resp/SelectFromAccEntity.java

+package com.yxproject.start.entity.resp;
+
+public class SelectFromAccEntity {
+    private String acceptNo;
+    private String county;
+    private String name;
+    private String cardType;
+    private String cardId;
+    private String sex;
+    private String signGovt;
+    private String beginDate;
+    private String endDate;
+    private String policeStation;
+    private String dataState;
+    private String time;
+
+    public String getAcceptNo() {
+        return acceptNo;
+    }
+
+    public void setAcceptNo(String acceptNo) {
+        this.acceptNo = acceptNo;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSignGovt() {
+        return signGovt;
+    }
+
+    public void setSignGovt(String signGovt) {
+        this.signGovt = signGovt;
+    }
+
+    public String getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(String beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getPoliceStation() {
+        return policeStation;
+    }
+
+    public void setPoliceStation(String policeStation) {
+        this.policeStation = policeStation;
+    }
+
+    public String getDataState() {
+        return dataState;
+    }
+
+    public void setDataState(String dataState) {
+        this.dataState = dataState;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

src/main/java/com/yxproject/start/entity/resp/SelectFromProdEntity.java

+package com.yxproject.start.entity.resp;
+
+public class SelectFromProdEntity {
+    private String acceptNo;
+    private String county;
+    private String name;
+    private String cardType;
+    private String cardId;
+    private String sex;
+    private String signGovt;
+    private String beginDate;
+    private String endDate;
+    private String policeStation;
+    private String dataState;
+    private String time;
+
+    public String getAcceptNo() {
+        return acceptNo;
+    }
+
+    public void setAcceptNo(String acceptNo) {
+        this.acceptNo = acceptNo;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSignGovt() {
+        return signGovt;
+    }
+
+    public void setSignGovt(String signGovt) {
+        this.signGovt = signGovt;
+    }
+
+    public String getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(String beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getPoliceStation() {
+        return policeStation;
+    }
+
+    public void setPoliceStation(String policeStation) {
+        this.policeStation = policeStation;
+    }
+
+    public String getDataState() {
+        return dataState;
+    }
+
+    public void setDataState(String dataState) {
+        this.dataState = dataState;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

src/main/java/com/yxproject/start/entity/resp/SelectFromTaskListEntity.java

+package com.yxproject.start.entity.resp;
+
+import java.util.Date;
+
+/**
+ * 根据任务单查询结果实体
+ * 任务单流水号	 区县	制证类型	日期	数据核验	膜打印	预定位	分拣	质检	仓库
+ */
+public class SelectFromTaskListEntity {
+
+    private String taskId;
+    private String county;
+    private Long cardType;
+    private Date issuedDate;
+    private Date dataCheckDate;
+    private Date printOutDate;
+    private Date positionDate;
+    private Date sortOutDate;
+    private Date qualityTestDate;
+    private Date outStorageDate;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public Long getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(Long cardType) {
+        this.cardType = cardType;
+    }
+
+    public Date getIssuedDate() {
+        return issuedDate;
+    }
+
+    public void setIssuedDate(Date issuedDate) {
+        this.issuedDate = issuedDate;
+    }
+
+    public Date getDataCheckDate() {
+        return dataCheckDate;
+    }
+
+    public void setDataCheckDate(Date dataCheckDate) {
+        this.dataCheckDate = dataCheckDate;
+    }
+
+    public Date getPrintOutDate() {
+        return printOutDate;
+    }
+
+    public void setPrintOutDate(Date printOutDate) {
+        this.printOutDate = printOutDate;
+    }
+
+    public Date getPositionDate() {
+        return positionDate;
+    }
+
+    public void setPositionDate(Date positionDate) {
+        this.positionDate = positionDate;
+    }
+
+    public Date getSortOutDate() {
+        return sortOutDate;
+    }
+
+    public void setSortOutDate(Date sortOutDate) {
+        this.sortOutDate = sortOutDate;
+    }
+
+    public Date getQualityTestDate() {
+        return qualityTestDate;
+    }
+
+    public void setQualityTestDate(Date qualityTestDate) {
+        this.qualityTestDate = qualityTestDate;
+    }
+
+    public Date getOutStorageDate() {
+        return outStorageDate;
+    }
+
+    public void setOutStorageDate(Date outStorageDate) {
+        this.outStorageDate = outStorageDate;
+    }
+}

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

-package com.yxproject.start.mapper;
-
-public interface Analysis {
-}

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

@@ -28,6 +28,6 @@ public interface CardDetailedListMapper {
     @Select("SELECT upload_no,subStr(UPLOAD_NO,0,9),ID_NO,NAME FROM PROD_CARD_T@PROD_LINK WHERE subStr(ACCEPT_NO,0,8) \n" +
             "IN (SELECT GROUP_NO FROM GROUP_NO WHERE TASK_ID=#{taskId} \n" +
             "AND (subStr(UPLOAD_NO,0,9)=#{gajgId}));")
-    public List<CardDetailedListEntity> selectCardDetiledListData(@Param("taskId")String taskId,@Param("gajgId")String gajgId);
+    public List<CardDetailedListEntity> selectCardDetailedListData(@Param("taskId")String taskId,@Param("gajgId")String gajgId);
 
 }

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.CountDataEntity;
 import com.yxproject.start.entity.FilesEntity;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface FilesMapper {
@@ -10,4 +14,9 @@ public interface FilesMapper {
     @Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREAT_TIME,SOURCE_FILE_NAME)" +
             "VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{creatTime},#{sourceFileName})")
     public boolean insertFiles(FilesEntity filesEntity);
+
+
+    @Select("")
+    public List<CountDataEntity> selectFilesCount();
+
 }

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

 package com.yxproject.start.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+@Mapper
 public interface GroupNoMapper {
 
     /**

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

+package com.yxproject.start.mapper;
+
+import com.yxproject.start.entity.NewFilesEntity;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Update;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/4   18:46
+ */
+@Mapper
+public interface NewFilesMapper {
+    @Insert("INSERT INTO NEW_FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_DATE) VALUES (#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createDate})")
+    @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
+    public long saveNewFiles(NewFilesEntity newFilesEntity);
+    @Update("UPDATE NEW_FILES SET NEW_FILE_NAME = #{newFileName} WHERE ID = #{id}")
+    public boolean updateNewFileName(NewFilesEntity newFilesEntity);
+}

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

@@ -24,21 +24,42 @@ public interface PreproPersonMapper {
 
 
     /*按条件查询制证数据*/
-    @Select("select * from PREPRO_PERSON \n" +
-            "left join files on PREPRO_PERSON.FILE_ID = files.ID\n" +
-            "left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +
-            "where 1=1 " +
-            " <when test='uploadNo!=null'> and PREPRO_PERSON.JMSFZSLH = #{uploadNo} </when>" +
-            " <when test='IDCard!=null'> and GMSFHM = #{IDCard} </when> " +
-            "  <when test='oldFile!=null'> and files.SOURCE_FILE_NAME =#{oldFile}  </when> " +
-            "  <when test='newFile!=null'> and  NEW_FILES.NEW_FILE_NAME = #{newFile} </when> " +
-            " <when test='SSXQDM!=null'> and PREPRO_PERSON.SSXQDM =#{SSXQDM} </when>   " +
-            "  <when test='cardType!=null'> and PREPRO_PERSON.CARD_TYPE_ID =#{cardType} </when> " +
-            "  <when test='state!=null'> and  PREPRO_PERSON.state = #{state} </when>  " +
-            "  <when test='uploadDate!=null'> and files.CREAT_TIME = #{uploadDate} </when> ")
+    @Select({"<script>"+
+            "select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID "+
+            "<where> " +
+            " 1=1" +
+                    "<if test='uploadNo != null '>"+
+                    "and PREPRO_PERSON.JMSFZSLH = #{uploadNo}"+
+                    "</if>"+
+                " <if test='IDCard != null '> ",
+                "and GMSFHM = #{IDCard} ",
+                "</if> " ,
+                " <if test='oldFile != null '> ",
+                "and files.SOURCE_FILE_NAME =#{oldFile} ",
+                " </if> " ,
+                " <if test='newFile != null'> ",
+                "and  NEW_FILES.NEW_FILE_NAME = #{newFile}",
+                " </if> " ,
+                " <if test='SSXQDM != null '> ",
+                "and PREPRO_PERSON.SSXQDM =#{SSXQDM}",
+                " </if>" ,
+                " <if test='cardType != null  '>",
+                " and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}",
+                " </if> " ,
+                " <if test='state != null'>",
+                " and  PREPRO_PERSON.state = #{state}",
+                " </if>  " ,
+                " <if test='uploadDate != null '>",
+                " and files.CREAT_TIME = #{uploadDate}",
+                " </if> ",
+            "</where>"+
+            "</script>"})
     public List<PreproPersonEntity> selectPreproPerson(@Param("uploadNo")String uploadNo, @Param("IDCard")String IDCard, @Param("oldFile")String oldFile, @Param("newFile")String newFile, @Param("SSXQDM")String SSXQDM, @Param("cardType")String cardType, @Param("state")String state, @Param("uploadDate")String uploadDate);
 
     /*修改标记制证数据状态*/
     @Update("UPDATE PREPRO_PERSON SET STATE = #{state} WHERE JMSFZSLH=#{acceptNo}")
     public boolean updateState (@Param("state")String state, @Param("acceptNo") String acceptNo);
+
+    @Update("UPDATE PREPRO_PERSON  SET NEW_FILE_ID=#{newFileId} where JMSFZSLH=#{jmsfzslh}")
+    public  boolean updateNewFileName(PreproPersonEntity personEntity);
 }
\ No newline at end of file

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

 package com.yxproject.start.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 /**
@@ -9,6 +10,6 @@ import org.apache.ibatis.annotations.Select;
  */
 @Mapper
 public interface QuerySequenceMapper {
-    @Select("select #{sequenceName} from dual")
-    public String selectSequenceNextValue(String sequenceName);
+    @Select("select #{sequenceName},#{sequenceName} as num2 from dual")
+    public Object[] selectSequenceNextValue(@Param("sequenceName") String sequenceName);
 }

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

 package com.yxproject.start.mapper;
 
 
+import com.yxproject.start.entity.resp.SelectFromAccEntity;
+import com.yxproject.start.entity.resp.SelectFromProdEntity;
+import com.yxproject.start.entity.resp.SelectFromTaskListEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -94,4 +97,34 @@ public interface SelectSerialNumberMapper {
             "        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)\n" +
             "        where  TASK_ID =#{id}")
     public Map<String,Object> selectByWorkOrderNumber(String id);
+
+
+    @Select("")
+    public Map<String,SelectFromTaskListEntity> selectByWorkOrderFromYX();
+    @Select("")
+    public Map<String, SelectFromAccEntity> selectByWorkOrderFromACC();
+    @Select("")
+    public Map<String,SelectFromTaskListEntity> selectByAcceptFromYX();
+    @Select("")
+    public Map<String,SelectFromAccEntity> selectByAcceptFromAcc();
+    @Select("")
+    public Map<String, SelectFromProdEntity>selectByAcceptFromProd();
+    @Select("")
+    public Map<String,SelectFromTaskListEntity> selectByGroupNoFromYX();
+    @Select("")
+    public Map<String,SelectFromProdEntity> selectByGroupNoFromProd();
+    @Select("")
+    public Map<String,SelectFromAccEntity> selectByGroupNoFromAcc();
+    @Select("")
+    public Map<String,SelectFromTaskListEntity>selectByCardIdFromYX();
+    @Select("")
+    public Map<String,SelectFromAccEntity> selectByCardIdFromAcc();
+    @Select("")
+    public Map<String,SelectFromProdEntity> selectByCardIdFromProd();
+
+
+
+
+
+
 }

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

@@ -2,8 +2,10 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.SysPermission;
 import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Administrator
@@ -14,8 +16,8 @@ public interface SysPermissionMapper{
      * 新增权限
      * @param sysPermission
      */
-    @Insert("INSERT INTO sys_permission (id,available,name,parent_id,parent_ids,permission,resource_type,url)\n" +
-            "VALUES (PERMISSION_seq.nextval,0,#{name},'0','0/',#{permission},#{resource_type},#{url})")
+    @Insert("INSERT INTO sys_permission (id,available,name,permission,url)\n" +
+            "VALUES (PERMISSION_seq.nextval,0,#{name},#{permission},#{url})")
     public void addPermissionByMap(SysPermission sysPermission);
 
     /**
@@ -74,7 +76,7 @@ public interface SysPermissionMapper{
      * 修改权限信息
      * @param sysPermission
      */
-    @Update("update SYS_PERMISSION SET NAME=#{name},resource_type=#{resource_type},url=#{url}," +
+    @Update("update SYS_PERMISSION SET NAME=#{name},url=#{url}," +
             "permission=#{permission} where id=#{id}")
     public void updatePermission(SysPermission sysPermission);
 }

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

@@ -2,6 +2,7 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.SysRole;
 import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -14,8 +15,8 @@ public interface SysRoleMapper {
      * 添加角色
      * @param sysRole
      */
-    @Insert("INSERT INTO SYS_ROLE(ID,AVAILABLE,DESCRIPTION,ROLE)\n" +
-            "VALUES(PERMISSION_seq.nextval,0,#{description},#{role})")
+    @Insert("INSERT INTO SYS_ROLE(ID,AVAILABLE,DESCRIPTION,ROLE,PROCESS)\n" +
+            "VALUES(PERMISSION_seq.nextval,0,#{description},#{role},#{process})")
     @Options(useGeneratedKeys = true, keyProperty = "id",keyColumn = "id")
     public void addRoleByMap(SysRole sysRole);
 
@@ -36,6 +37,7 @@ public interface SysRoleMapper {
             @Result(property = "role",column = "role"),
             @Result(property = "description",column = "description"),
             @Result(property = "available",column = "available"),
+            @Result(property = "process",column = "process"),
             @Result(property = "permissions",javaType = List.class,column ="id",
                     many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
     public List<SysRole> selectAllRole();
@@ -65,6 +67,7 @@ public interface SysRoleMapper {
             @Result(property = "role",column = "role"),
             @Result(property = "description",column = "description"),
             @Result(property = "available",column = "available"),
+            @Result(property = "process",column = "process"),
             @Result(property = "permissions",javaType = List.class,column ="id",
                     many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
     List<SysRole> selectRoleAndPermissionByUserId(@Param("userId") Integer userId);
@@ -102,6 +105,7 @@ public interface SysRoleMapper {
             @Result(property = "role",column = "role"),
             @Result(property = "description",column = "description"),
             @Result(property = "available",column = "available"),
+            @Result(property = "process",column = "process"),
             @Result(property = "permissions",javaType = List.class,column ="id",
                     many = @Many(select = "com.yxproject.start.mapper.SysPermissionMapper.selectPermissionByRoleId"))})
     public SysRole selectRoleByRoleId(@Param("roleId") Integer roleId);

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

@@ -12,7 +12,7 @@ import java.util.List;
 public interface CardDetailedListService {
 
 
-    public List<CardDetailedListEntity> selectCardDetiledListData(String taskId, String gajgId);
+    public List<CardDetailedListEntity> selectCardDetailedListData(String taskId, String gajgId);
 
     public boolean saveCardDetailedList(String uploadNo,String policeCode,String cardId,String name);
 

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

+package com.yxproject.start.service;
+
+import com.yxproject.start.entity.NewFilesEntity;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/4   18:47
+ */
+public interface NewFilesService {
+    public long saveNewFiles(NewFilesEntity newFilesEntity);
+    public boolean updateNewFileName(NewFilesEntity newFilesEntity);
+}

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

@@ -25,4 +25,5 @@ public interface PersonPostService {
 
     public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate);
 
+
 }

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

@@ -12,5 +12,8 @@ public interface PreproPersonService {
 
     public boolean uploadState(String acceptNo,String state);
 
+
     public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate);
+
+    public boolean updatePreproPerson_NewFileName(List<PreproPersonEntity> preproPersonEntities);
 }

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

 package com.yxproject.start.service;
 
-import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
-import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
-import com.yxproject.start.entity.resp.SelectByIdcardEntity;
-import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
+import com.yxproject.start.entity.resp.*;
 
 
 public interface SelectSerialNumberService {
-    SelectByGroupNumEntity selectByGroupNumberFromYX(String id);
-    SelectByGroupNumEntity selectByGroupNumberFromACC(String id);
-    SelectByAcceptedEntity selectByAccepted(String id);
-    SelectByIdcardEntity selectByIdCard(String id);
-    SelectByWorkOrderEntity selectByWorkOrderNumber(String id);
+    /*根据任务单查询辅助库*/
+    SelectFromTaskListEntity selectByWorkOrderFromYX(String id);
+
+    /*根据受理号查询*/
+    SelectFromTaskListEntity selectByAcceptFromYX(String id);
+    SelectFromAccEntity selectByAcceptFromAcc(String id);
+    SelectFromProdEntity selectByAcceptFromProd(String id);
+
+    /*根据组号查询*/
+    SelectFromTaskListEntity selectByGroupNoFromYX(String id);
+    SelectFromProdEntity selectByGroupNoFromProd(String id);
+    SelectFromAccEntity selectByGroupNoFromAcc(String id);
+
+    /*根据身份证号查询*/
+    SelectFromTaskListEntity selectByCardIdFromYX(String id);
+    SelectFromAccEntity selectByCardIdFromAcc(String id);
+    SelectFromProdEntity selectByCardIdFromProd(String id);
+
+
+
 }
 

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

@@ -18,8 +18,8 @@ public class CardDetailedListServiceImpl implements CardDetailedListService {
     private CardDetailedListMapper cardDetailedListMapper;
 
     @Override
-    public List<CardDetailedListEntity> selectCardDetiledListData(String taskId, String gajgId) {
-        List<CardDetailedListEntity> list  = cardDetailedListMapper.selectCardDetiledListData(taskId,gajgId);
+    public List<CardDetailedListEntity> selectCardDetailedListData(String taskId, String gajgId) {
+        List<CardDetailedListEntity> list  = cardDetailedListMapper.selectCardDetailedListData(taskId,gajgId);
         return list;
     }
 

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.entity.NewFilesEntity;
+import com.yxproject.start.mapper.NewFilesMapper;
+import com.yxproject.start.service.NewFilesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/4   18:52
+ */
+@Service
+public class NewFilesServiceImpl implements NewFilesService {
+    @Autowired
+    private NewFilesMapper newFilesMapper;
+
+    @Override
+    public long saveNewFiles(NewFilesEntity newFilesEntity) {
+
+        return newFilesMapper.saveNewFiles(newFilesEntity);
+    }
+
+    @Override
+    public boolean updateNewFileName(NewFilesEntity newFilesEntity) {
+        return newFilesMapper.updateNewFileName(newFilesEntity);
+    }
+}

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

@@ -24,7 +24,29 @@ public class PreproPersonServiceImpl implements PreproPersonService {
     }
     @Override
     public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) {
-        List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate);
+        List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPerson(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate));
         return preproPersonEntities;
     }
+    private String replace(String str){
+        if ("".equals(str)){
+            return null;
+        }else {
+            return str;
+        }
+
+    }
+
+    /**
+     * 更新制证信息表中新文件名
+     * @param preproPersonEntities
+     * @return
+     */
+    @Override
+    public boolean updatePreproPerson_NewFileName(List<PreproPersonEntity> preproPersonEntities) {
+        for (PreproPersonEntity preproPersonEntity: preproPersonEntities) {
+            preproPersonMapper.updateNewFileName(preproPersonEntity);
+        }
+
+        return true;
+    }
 }

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

 package com.yxproject.start.service.impl;
 
-import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
-import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
-import com.yxproject.start.entity.resp.SelectByIdcardEntity;
-import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
+import com.yxproject.start.entity.resp.*;
 import com.yxproject.start.mapper.SelectSerialNumberMapper;
 import com.yxproject.start.service.SelectSerialNumberService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,144 +17,56 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService
     public SelectSerialNumberMapper selectSerialNumberMapper;
 
 
-    @Override
-    public SelectByGroupNumEntity selectByGroupNumberFromYX(String id){
-
-            Map<String, Object> map = selectSerialNumberMapper.selectByGroupNumber(id);
-            SelectByGroupNumEntity selectByGroupNumEntity = new SelectByGroupNumEntity();
-            try {
-                selectByGroupNumEntity.setLibrary("盈信库");
-                selectByGroupNumEntity.setCityName(String.valueOf(map.get("CITYNAME")));
-                selectByGroupNumEntity.setCardType((String) map.get("CARD_TYPE"));
-                selectByGroupNumEntity.setPainterName((String) map.get("PRINTER_NAME"));
-                selectByGroupNumEntity.setTaskId(String.valueOf(map.get("TASK_ID")));
-                selectByGroupNumEntity.setGroup_No(String.valueOf(map.get("GROUP_NO")));
-                selectByGroupNumEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
-                selectByGroupNumEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
-                selectByGroupNumEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
-                selectByGroupNumEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
-                selectByGroupNumEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
-                selectByGroupNumEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
-            }catch (NullPointerException e){
-                e.printStackTrace();
-            }
-            return selectByGroupNumEntity;
-    }
 
     @Override
-    public SelectByGroupNumEntity selectByGroupNumberFromACC(String id){
-
-        Map<String, Object> map = selectSerialNumberMapper.selectByGroupNumber(id);
-        SelectByGroupNumEntity selectByGroupNumEntity = new SelectByGroupNumEntity();
-        try {
-            selectByGroupNumEntity.setLibrary("受理库");
-            selectByGroupNumEntity.setCityName(String.valueOf(map.get("CITYNAME")));
-            selectByGroupNumEntity.setCardType((String) map.get("CARD_TYPE"));
-            selectByGroupNumEntity.setPainterName((String) map.get("PRINTER_NAME"));
-            selectByGroupNumEntity.setTaskId(String.valueOf(map.get("TASK_ID")));
-            selectByGroupNumEntity.setGroup_No(String.valueOf(map.get("GROUP_NO")));
-            selectByGroupNumEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
-            selectByGroupNumEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
-            selectByGroupNumEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
-            selectByGroupNumEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
-            selectByGroupNumEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
-            selectByGroupNumEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
-        }catch (NullPointerException e){
-            e.printStackTrace();
-        }
-        return selectByGroupNumEntity;
+    public SelectFromTaskListEntity selectByWorkOrderFromYX(String id) {
+
+        return null;
     }
 
 
+    @Override
+    public SelectFromTaskListEntity selectByAcceptFromYX(String id) {
+        return null;
+    }
 
     @Override
-    public SelectByAcceptedEntity selectByAccepted(String id){
-        Map<String,Object> map = selectSerialNumberMapper.selectByAccepted(id);
-        SelectByAcceptedEntity selectByAcceptedEntity = new SelectByAcceptedEntity();
-        String sex ;
-        try {
-            if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
-                sex = "男";
-            }else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
-                sex = "女";
-            }else {
-                sex = "缺失";
+    public SelectFromAccEntity selectByAcceptFromAcc(String id) {
+        return null;
     }
 
-            selectByAcceptedEntity.setCardType((String) map.get("CARD_TYPE"));
-            selectByAcceptedEntity.setLibrary("受理库");
-            selectByAcceptedEntity.setAccept_No((String) map.get("ACCEPT_NO"));
-            selectByAcceptedEntity.setName((String) map.get("NAME"));
-            selectByAcceptedEntity.setSex_No(sex);
-            selectByAcceptedEntity.setId_No((String) map.get("ID_NO"));
-            selectByAcceptedEntity.setBirthday((String) map.get("BIRTHDAY"));
-            selectByAcceptedEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
-            selectByAcceptedEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
-            selectByAcceptedEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
-            selectByAcceptedEntity.setStatus_No((String) map.get("STATUS_NO"));
-            selectByAcceptedEntity.setTaskState((String) map.get("TASK_STATE"));
-            selectByAcceptedEntity.setCityName((String) map.get("CITYNAME"));
-            selectByAcceptedEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
-
-        }catch (NullPointerException e){
-            e.printStackTrace();
+    @Override
+    public SelectFromProdEntity selectByAcceptFromProd(String id) {
+        return null;
     }
-        return selectByAcceptedEntity;
+
+    @Override
+    public SelectFromTaskListEntity selectByGroupNoFromYX(String id) {
+        return null;
     }
+
     @Override
-    public SelectByIdcardEntity selectByIdCard(String id){
-        Map<String,Object> map = selectSerialNumberMapper.selectByIdCard(id);
-        SelectByIdcardEntity selectByIdcardEntity = new SelectByIdcardEntity();
-        String sex ;
-        try {
-            if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
-                sex = "男";
-            }else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
-                sex = "女";
-            }else {
-                sex = "缺失";
+    public SelectFromProdEntity selectByGroupNoFromProd(String id) {
+        return null;
     }
 
-            selectByIdcardEntity.setCardType((String) map.get("CARD_TYPE"));
-            selectByIdcardEntity.setLibrary("受理库");
-            selectByIdcardEntity.setAccept_No((String) map.get("ACCEPT_NO"));
-            selectByIdcardEntity.setName((String) map.get("NAME"));
-            selectByIdcardEntity.setSex_No(sex);
-            selectByIdcardEntity.setId_No((String) map.get("ID_NO"));
-            selectByIdcardEntity.setBirthday((String) map.get("BIRTHDAY"));
-            selectByIdcardEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
-            selectByIdcardEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
-            selectByIdcardEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
-            selectByIdcardEntity.setStatus_No((String) map.get("STATUS_NO"));
-            selectByIdcardEntity.setTaskState((String) map.get("TASK_STATE"));
-            selectByIdcardEntity.setCityName((String) map.get("CITYNAME"));
-            selectByIdcardEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
-        }catch (NullPointerException e){
-            e.printStackTrace();
+    @Override
+    public SelectFromAccEntity selectByGroupNoFromAcc(String id) {
+        return null;
     }
-        return selectByIdcardEntity;
+
+    @Override
+    public SelectFromTaskListEntity selectByCardIdFromYX(String id) {
+        return null;
     }
 
     @Override
-    public SelectByWorkOrderEntity selectByWorkOrderNumber(String id){
-        Map<String,Object> map = selectSerialNumberMapper.selectByWorkOrderNumber(id);
-        SelectByWorkOrderEntity selectByWorkOrderEntity = new SelectByWorkOrderEntity();
-
-        try {
-            selectByWorkOrderEntity.setLibrary("盈信库");
-            selectByWorkOrderEntity.setCityName((String) map.get("CITYNAME"));
-            selectByWorkOrderEntity.setCardType((String) map.get("CARD_TYPE"));
-            selectByWorkOrderEntity.setPainterName((String) map.get("PRINTER_NAME"));
-            selectByWorkOrderEntity.setTask_Id(Long.valueOf(String.valueOf( map.get("TASK_ID"))));
-            selectByWorkOrderEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
-            selectByWorkOrderEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
-            selectByWorkOrderEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
-            selectByWorkOrderEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
-            selectByWorkOrderEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
-            selectByWorkOrderEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
-        } catch (NullPointerException e){
-            e.printStackTrace();
+    public SelectFromAccEntity selectByCardIdFromAcc(String id) {
+        return null;
     }
-        return selectByWorkOrderEntity;
+
+    @Override
+    public SelectFromProdEntity selectByCardIdFromProd(String id) {
+        return null;
     }
 }

src/main/java/com/yxproject/start/utils/ExportXml.java

-package com.yxproject.start.utils;
-
-import com.yxproject.start.entity.FilesEntity;
-import com.yxproject.start.entity.PreproPersonEntity;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @auther zhangyusheng
- * 2019/2/13   16:05
- */
-public class ExportXml {
-    /**
-     * 生成单个可制证数据XML
-     *
-     * @throws IOException 可能出现文件写入不成功
-     */
-    public static void createToMakePackageXML(List<PreproPersonEntity> preproPersonEntities , FilesEntity filesEntity, String url) throws IOException {
-        //todo
-        Document document = DocumentHelper.createDocument();
-        Element PACKAGE = DocumentHelper.createElement("PACKAGE");
-        document.setRootElement(PACKAGE);
-        Element PACKAGEHEAD = PACKAGE.addElement("PACKAGEHEAD");
-        Element DATA = PACKAGE.addElement("DATA");
-        Element DWDM = PACKAGEHEAD.addElement("DWDM");
-        DWDM.setText(filesEntity.getDwdm());
-        Element DWMC = PACKAGEHEAD.addElement("DWMC");
-        DWMC.setText(filesEntity.getDwmc());
-        Element JLS = PACKAGEHEAD.addElement("JLS");
-        JLS.setText(preproPersonEntities.size()+"");
-
-        int NO=1;
-        for (PreproPersonEntity preproPersonEntity : preproPersonEntities) {
-            Element RECORD = DATA.addElement("RECORD");
-            RECORD.addAttribute("no", NO+"");
-            RECORD.addAttribute("sid", preproPersonEntity.getSid());
-            Element JMSFZSLH = RECORD.addElement("JMSFZSLH");
-            JMSFZSLH.setText(preproPersonEntity.getJmsfzslh());
-            Element GMSFHM = RECORD.addElement("GMSFHM");
-            GMSFHM.setText(preproPersonEntity.getGmsfhm());
-            Element XM = RECORD.addElement("XM");
-            XM.setText(replaceNullString(preproPersonEntity.getXm()));
-            Element XBDM = RECORD.addElement("XBDM");
-            XBDM.setText(replaceNullString(preproPersonEntity.getXbdm()));
-            Element MZDM = RECORD.addElement("MZDM");
-            MZDM.setText(replaceNullString(preproPersonEntity.getMzdm()));
-            Element CSRQ = RECORD.addElement("CSRQ");
-            CSRQ.setText(replaceNullString(preproPersonEntity.getCsrq()));
-            Element SSXQDM = RECORD.addElement("SSXQDM");
-            SSXQDM.setText(replaceNullString(preproPersonEntity.getSsxqdm()));
-            Element DZMC = RECORD.addElement("DZMC");
-            DZMC.setText(replaceNullString(preproPersonEntity.getDzmc()));
-            Element SDXP = RECORD.addElement("SDXP");
-            SDXP.setText(replaceNullString(preproPersonEntity.getSdxp()));
-            Element ZWY_ZWTXSJ = RECORD.addElement("ZWY_ZWTXSJ");
-            ZWY_ZWTXSJ.setText(replaceNullString(preproPersonEntity.getZwyZwtxsj()));
-            Element ZWY_ZWTZSJ = RECORD.addElement("ZWY_ZWTZSJ");
-            ZWY_ZWTZSJ.setText(replaceNullString(preproPersonEntity.getZwyZwtzsj()));
-            Element ZWE_ZWTXSJ = RECORD.addElement("ZWE_ZWTXSJ");
-            ZWE_ZWTXSJ.setText(replaceNullString(preproPersonEntity.getZweZwtxsj()));
-            Element ZWE_ZWTZSJ = RECORD.addElement("ZWE_ZWTZSJ");
-            ZWE_ZWTZSJ.setText(replaceNullString(preproPersonEntity.getZweZwtzsj()));
-            Element QFJG_GAJGMC = RECORD.addElement("QFJG_GAJGMC");
-            QFJG_GAJGMC.setText(replaceNullString(preproPersonEntity.getQfjgGajgmc()));
-            Element YXQQSRQ = RECORD.addElement("YXQQSRQ");
-            YXQQSRQ.setText(preproPersonEntity.getYxqqsrq());
-            Element YXQJZRQ = RECORD.addElement("YXQJZRQ");
-            YXQJZRQ.setText(preproPersonEntity.getYxqjzrq());
-            Element JMSFZSLYYDM = RECORD.addElement("JMSFZSLYYDM");
-            JMSFZSLYYDM.setText(preproPersonEntity.getJmsfzslyydm());
-            Element JMSFZZZLXDM = RECORD.addElement("JMSFZZZLXDM");
-            JMSFZZZLXDM.setText(preproPersonEntity.getJmsfzzzlxdm());
-            Element JMSFZLZFSDM = RECORD.addElement("JMSFZLZFSDM");
-            JMSFZLZFSDM.setText(preproPersonEntity.getJmsfzlzfsdm());
-            Element SJR_XM = RECORD.addElement("SJR_XM");
-            SJR_XM.setText(replaceNullString(preproPersonEntity.getSjrXm()));
-            Element SJR_LXDH = RECORD.addElement("SJR_LXDH");
-            SJR_LXDH.setText(replaceNullString(preproPersonEntity.getSjrLxdh()));
-            Element SJR_YZBM = RECORD.addElement("SJR_YZBM");
-            SJR_YZBM.setText(replaceNullString(preproPersonEntity.getSjrYzbm()));
-            Element SJR_TXDZ = RECORD.addElement("SJR_TXDZ");
-            SJR_TXDZ.setText(replaceNullString(preproPersonEntity.getSjrTxdz()));
-            NO++;
-        }
-        YXStringUtils.saveDom2File(document, url + "\\" + "ZAGL_ZZJH_"  + ".xml");
-    }
-
-    /**
-     * 字符串去除空格
-     * @param str 原始字符串
-     * @return 返回新的字符串
-     */
-    public static String replaceNullString(String str) {
-        if (str == null) return "";
-        else return str;
-    }
-}

src/main/java/com/yxproject/start/utils/QuerySequenceSercive.java

@@ -13,8 +13,8 @@ public class QuerySequenceSercive {
     @Autowired
     private QuerySequenceMapper querySequenceMapper;
     public String selectSequenceNextValue(String sequenceName){
-        String s = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval()");
-        return s;
+        Object[] objects = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval");
+        return "";
 
     }
 

src/main/resources/mapper/config/mybatis-config.xml

@@ -5,5 +5,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
 <configuration>
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
+        <setting name="logImpl" value="STDOUT_LOGGING" />
     </settings>
 </configuration>
\ No newline at end of file

src/main/resources/static/index.html

@@ -134,132 +134,16 @@
         <!-- sidebar: style can be found in sidebar.less -->
         <section class="sidebar">
             <!-- search form -->
-
             <!-- sidebar menu: : style can be found in sidebar.less -->
             <ul class="sidebar-menu" data-widget="tree">
                 <li class="header">
                     导航
                 </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/xmlAndSearch']" ng-click="getFocus('/xmlAndSearch')">
-                    <a href="#!/xmlAndSearch">
-                        <i class="fa fa-file-code-o"></i>
-                        <span>制证包管理</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/excelAndSearch']"
-                    ng-click="getFocus('/excelAndSearch')">
-                    <a href="#!/excelAndSearch">
-                        <i class="fa fa-file-excel-o"></i>
-                        <span>格口文件管理</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/cardProdPackage']"
-                    ng-click="getFocus('/cardProdPackage')">
-                    <a href="#!/cardProdPackage">
-                        <i class="fa fa-folder"></i>
-                        <span>制证信息打包</span>
-                    </a>
-                </li>
-                <li class="treeview" ng-class="{true: 'active', false: ''}[tab =='/cardProdUpdate']"
-                    ng-click="getFocus('/cardProdUpdate')">
-                    <a href="#">
-                        <i class="fa fa-cog"></i> <span>系统管理</span>
-                        <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                    </a>
-                    <ul class="treeview-menu">
-                        <li><a href="#!/analysisLog"><i class="fa fa-circle-o"></i> 解析日志</a></li>
-                        <li><a href="#!/packageLog"><i class="fa fa-circle-o"></i> 新包日志</a></li>
-                        <li><a href="#!/cardProdUpdate"><i class="fa fa-circle-o"></i> 制证信息管理</a></li>
-                    </ul>
-                </li>
 
-                <li ng-class="{true: 'active', false: ''}[tab =='/searchCardMsg']"
-                    ng-click="getFocus('/searchCardMsg')">
-                    <a href="#!/searchCardMsg">
-                        <i class="fa fa-files-o"></i>
-                        <span>邮政快递单打印</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/uploadExcelAndSearch']"
-                    ng-click="getFocus('/uploadExcelAndSearch')">
-                    <a href="#!/uploadExcelAndSearch">
-                        <i class="fa fa-table"></i>
-                        <span>邮政快递单管理</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/createTaskList']"
-                    ng-click="getFocus('/createTaskList')">
-                    <a href="#!/createTaskList">
-                        <i class="fa fa-dashboard"></i>
-                        <span>任务单创建</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/dispatchTask']" ng-click="getFocus('/dispatchTask')">
-                    <a href="#!/dispatchTask">
-                        <i class="fa fa-dashboard"></i>
-                        <span>任务单下发</span>
-                    </a>
-                </li>
-
-
-                <li ng-class="{true: 'active', false: ''}[tab =='/taskListPrint']"
-                    ng-click="getFocus('/taskListPrint')">
-                    <a href="#!/taskListPrint">
-                        <i class="fa fa-dashboard"></i>
-                        <span>膜打印任务单</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/taskListPreLocating']"
-                    ng-click="getFocus('/taskListPreLocating')">
-                    <a href="#!/taskListPreLocating">
-                        <i class="fa fa-dashboard"></i>
-                        <span>预定位任务单</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/taskListQualityCheck']"
-                    ng-click="getFocus('/taskListQualityCheck')">
-                    <a href="#!/taskListQualityCheck">
-                        <i class="fa fa-dashboard"></i>
-                        <span>质检任务单</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/taskListSorting']"
-                    ng-click="getFocus('/taskListSorting')">
-                    <a href="#!/taskListSorting">
-                        <i class="fa fa-dashboard"></i>
-                        <span>分拣任务单</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/tagPrint']" ng-click="getFocus('/tagPrint')">
-                    <a href="#!/tagPrint">
-                        <i class="fa fa-dashboard"></i>
-                        <span>封条打印</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/receitp']" ng-click="getFocus('/receitp')">
-                    <a href="#!/receitp">
-                        <i class="fa fa-file-text-o"></i>
-                        <span>交接单</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/addFailed']" ng-click="getFocus('/addFailed')">
-                    <a href="#!/addFailed">
-                        <i class="fa fa-plus"></i>
-                        <span>废证添加</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/addRest']" ng-click="getFocus('/addRest')">
-                    <a href="#!/addRest">
-                        <i class="fa fa-plus"></i>
-                        <span>余证</span>
-                    </a>
-                </li>
-                <li ng-class="{true: 'active', false: ''}[tab =='/historyBack']" ng-click="getFocus('/historyBack')">
-                    <a href="#!/historyBack">
-                        <i class="fa fa-plus"></i>
-                        <span>历史回迁证</span>
+                <li ng-repeat="menu in menuList" ng-class="{true: 'active', false: ''}[tab =='{{menu.url}}']" ng-click="getFocus('{{menu.url}}')">
+                    <a href="#!{{menu.url}}">
+                        <i class="fa fa-file-code-o"></i>
+                        <span ng-bind="menu.name"></span>
                     </a>
                 </li>
                 <li>

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

@@ -24,9 +24,9 @@ angular.module('AvatarCheck', [
     'AvatarCheck.packageLog',
     'AvatarCheck.tagPrint',
     'tm.pagination'
-]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider', function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
+]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
         $locationProvider.hashPrefix('!');
-    $routeProvider.otherwise({redirectTo: '/xmlAndSearch'});
+    $routeProvider.otherwise({redirectTo: '/createTaskList'});
         localStorageServiceProvider.setPrefix('AvatarCheck')
     $qProvider.errorOnUnhandledRejections(false)
 }])
@@ -37,15 +37,21 @@ angular.module('AvatarCheck', [
 
         $rootScope.loginData = localStorageService.get('loginData')
 
+
+
         if($rootScope.loginData == null){
             $rootScope.loginData = {userid:'用户未登录', login:false};
         }
         if($rootScope.loginData.login == false){
             $location.path("/login");
         }
+        if($rootScope.loginData.login == true){
+            $rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
+            console.log($scope.menuList)
+        }
+
 
 
-        $rootScope.tab = '/xmlAndSearch';
         if ($location.path() == "/excelAndSearch") {
             $rootScope.tab = '/excelAndSearch';
         }
@@ -118,7 +124,6 @@ angular.module('AvatarCheck', [
         }
 
 
-
         console.log($rootScope.tab)
         $scope.getFocus = function (index) {
             if(index=='/tagPrint'){

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

@@ -24,19 +24,19 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
         $('#datepicker1').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
             language: 'zh-CN',
-            format: 'yyyy-mm-dd',
+            format: 'yyyyMMdd',
             todayBtn: 1,
             autoclose: 1
         });
         $('#datepicker2').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
             language: 'zh-CN',
-            format: 'yyyy-mm-dd',
+            format: 'yyyyMMdd',
             todayBtn: 1,
             autoclose: 1
         });
 
-        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+        $scope.choseDate = $filter("date")(new Date(), "yyyyMMdd");
 
         $scope.paginationConf = {
             currentPage: 1,
@@ -46,6 +46,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
         $scope.paginationConf.totalItems = 50;
 
         $scope.uploadExcel = function () {
+            console.log($("#datepicker1").val())
             var fd = new FormData();
             var files = document.querySelector('input#id_file_photo_for_check').files;
             fd.append("formStartTime",$("#datepicker1").val());

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

@@ -28,6 +28,38 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
             }
         }
 
+        var whereToGo = function(process){
+            switch (process){
+                case 1:
+                    $location.path("/createTaskList");
+                    $rootScope.tab = '/createTaskList';
+                    break;
+                case 2:
+                    $location.path("/taskListPrint");
+                    $rootScope.tab = '/taskListPrint';
+                    break;
+                case 3:
+                    $location.path("/taskListPreLocating");
+                    $rootScope.tab = '/taskListPreLocating';
+                    break;
+                case 4:
+                    $location.path("/taskListSorting");
+                    $rootScope.tab = '/taskListSorting';
+                    break;
+                case 5:
+                    $location.path("/taskListQualityCheck");
+                    $rootScope.tab = '/taskListQualityCheck';
+                    break;
+                case 6:
+                    $location.path("/receitp");
+                    $rootScope.tab = '/receitp';
+                    break;
+                case 7:
+                    $location.path("/excelAndSearch");
+                    $rootScope.tab = '/excelAndSearch';
+                    break;
+            }
+        }
 
         $scope.user = {};
         $scope.doLogin = function(){
@@ -41,7 +73,9 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
                     $rootScope.loginData = resp.data.user;
                     $rootScope.loginData.login =true;
                     localStorageService.set('loginData', resp.data.user);
-                    $location.path('/xmlAndSearch')
+                    $rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
+                    console.log($scope.menuList)
+                    whereToGo($rootScope.loginData.roleList[0].process)
                     if(userAgent.indexOf('.NET')!=-1){
                         window.location.reload();
                     }else{