Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev

pom.xml

@@ -28,6 +28,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -50,9 +56,35 @@
 		<!--引入log4j2作为日志组件-->
 		<!--<dependency>-->
 			<!--<groupId>org.springframework.boot</groupId>-->
-			<!--<artifactId>spring-boot-starter-log4j2</artifactId>-->
+			<!--<artifactId>spring-boot-starter-log4j</artifactId>-->
+			<!--<version>1.3.2.RELEASE</version>-->
 		<!--</dependency>-->
 
+		<!--<dependency>-->
+			<!--<groupId>log4j</groupId>-->
+			<!--<artifactId>log4j</artifactId>-->
+			<!--<version>1.2.17</version>-->
+		<!--</dependency>-->
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.5</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.7.12</version>
+		</dependency>
+
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+
+
 		<!-- shiro相关 -->
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
@@ -77,6 +109,22 @@
 			<version>1.6.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j</artifactId>
+			<version>1.3.8.RELEASE</version>
+		</dependency>
+
 		<dependency>
 			<groupId>net.sf.json-lib</groupId>
 			<artifactId>json-lib</artifactId>

src/log4j.properties

+#控制日志级别，在哪里输出Output pattern : date [thread] priority category - message   FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 
+log4j.rootLogger=INFO, stdout
+
+#控制台  显示的的方式为控制台普通方式
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+#日志输出的格式
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
+
+#打印sql部分
+log4j.logger.java.sql=DEBUG
+log4j.logger.java.sql.Connection = DEBUG  
+log4j.logger.java.sql.Statement = DEBUG  
+log4j.logger.java.sql.PreparedStatement = DEBUG  
+log4j.logger.java.sql.ResultSet = DEBUG
+
+
+log4j.logger.com.yxproject.start.entity=DEBUG
\ No newline at end of file

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

@@ -239,7 +239,7 @@ public class AdminApi {
         SysPermission sysPermission = new SysPermission();
         sysPermission.setName(jsonObject.getString("name"));
         sysPermission.setResource_type(jsonObject.getString("resourceType"));
-//        sysPermission.setUrl(jsonObject.getString("url"));
+        sysPermission.setUrl(jsonObject.getString("url"));
         sysPermission.setPermission(jsonObject.getString("permission"));
 //        sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId")));
 //        if(jsonObject.getString("parentId").equals(str)){
@@ -401,7 +401,7 @@ public class AdminApi {
         sysPermission.setId(Integer.parseInt(jsonObject.getString("id")));
         sysPermission.setName(jsonObject.getString("name"));
         sysPermission.setResource_type(jsonObject.getString("resourceType"));
-//        sysPermission.setUrl(jsonObject.getString("url"));
+        sysPermission.setUrl(jsonObject.getString("url"));
         sysPermission.setPermission(jsonObject.getString("permission"));
 //        sysPermission.setParent_id(Long.parseLong(parentId));
 //        if(parentId.equals(str)){

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

 package com.yxproject.start.api;
 
 //import com.yxproject.start.service.FindCbCountByDealdateViewService;
-import com.yxproject.start.service.CardBodyService;
-import com.yxproject.start.service.FindFinancialReportByViewService;
-import com.yxproject.start.service.FindStationCountService;
-import com.yxproject.start.service.FindTaskByDealdateViewService;
+import com.yxproject.start.entity.FindStationCountByViewEntity;
+import com.yxproject.start.entity.SpecialCardEntity;
+import com.yxproject.start.service.*;
 import com.yxproject.start.utils.YXJSONResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +30,10 @@ public class YingxinApi {
     private FindStationCountService findStationCountService;
     @Autowired
     private FindFinancialReportByViewService findFinancialReportByViewService;
+    @Autowired
+    private AddTuiZhengService addTuiZhengService;
+    @Autowired
+    private AddRemainingCardService addRemainingCardService;
     /**
      * 查询在受理库查询任务单详情 根据处理时间查询;
      *
@@ -71,7 +74,7 @@ public class YingxinApi {
      */
     @RequestMapping("getStateCountInfo")
     public String getStateCountInfo(@RequestParam("submitDate") String submitDate,@RequestParam("state") String state,HttpServletResponse resp){
-        List<Map<String,Object>> list=findStationCountService.getStationCountData(submitDate,state);
+        List<FindStationCountByViewEntity> list=findStationCountService.getStationCountData(submitDate,state);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(list);
@@ -93,5 +96,31 @@ public class YingxinApi {
         return yxjsonResponse.toJSONString();
     }
 
+   /*
+   *添加退证
+   *
+   * */
+    @RequestMapping("addInValidCardInfo")
+    public String addTuiZhengInfo(@RequestParam("acceptNo")String acceptNumber,HttpServletResponse resp){
+        List<SpecialCardEntity> list=addTuiZhengService.getTuiZhengData(acceptNumber);
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(list);
+        Map map = new HashMap();
+        return yxjsonResponse.toJSONString();
+    }
+/*
+   *添加余证
+   *
+   * */
+    @RequestMapping("addRemainingCardInfo")
+    public  String addRemainingCardInfo(@RequestParam("acceptNo")String accept_Number,HttpServletResponse resp){
+        List<SpecialCardEntity> list=addRemainingCardService.getRemainingCardData(accept_Number);
+        YXJSONResponse yxjsonResponse =new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(list);
+        Map map=new HashMap();
+        return yxjsonResponse.toJSONString();
+    }
 }
 

src/main/java/com/yxproject/start/entity/accu/AccCardInfoEntity.java

@@ -4,5 +4,7 @@ package com.yxproject.start.entity.accu;
  * Created by zhangyusheng on 2018/10/31 15:12
  */
 public class AccCardInfoEntity {
+
+
     
 }

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

@@ -16,10 +16,10 @@ import java.util.Map;
 
 @Mapper
 public interface CountyListMapper {
-    public List<CountyEntity> findCountyList(@Param("taskListId") String taskListId,@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
-    public int reviseStorageCount( @Param("taskListId") String taskListId, @Param("countyCode") String countyCode,@Param("in_Storage_Count") String in_Storage_Count,@Param("out_Storage_Count") String out_Storage_Count);
+    public List<CountyEntity> findCountyList(String taskId);
+    public int reviseStorageCount( @Param("taskId") String taskId, @Param("countyCode") String countyCode,@Param("inStorageCount") String inStorageCount,@Param("outStorageCount") String out_Storage_Count);
     public List<ReceiptListEntity> getReceiptList( @Param("startDate")String startDate , @Param("endDate") String endDate);
-    public List<CountyListEntity> findStorageCountByTaskListId(String taskListId);
+    public List<CountyListEntity> findStorageCountByTaskId(String taskId);
     public int totalFinshCount ();
     public int totalInStorageCount ();
     public int totalOutStorageCount ();

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.FindStationCountByViewEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,5 +12,5 @@ import java.util.Map;
  */
 @Mapper
 public interface FindStationCountMapper {
-    public List<Map<String,Object>>findStationCountByDealDate(@Param("submitDate") String submitDate,@Param("state") String state);
+    public List<FindStationCountByViewEntity> findStationCountByDealDate(@Param("submitDate") String submitDate, @Param("state") String state);
 }

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

@@ -20,7 +20,7 @@ public interface GroupNoMapper {
     public int findGroupNoCountByTaskId(String task_Id);
     public List<Map<String,Object>> findSpecialCountyList(String task_Id);
     public List<Map<String,Object>> findNormalCountyList(String task_Id);
-    public List<GroupListEntity> findGroupListByTaskListId( String taskListId);
+    public List<GroupListEntity> findGroupListByTaskId( String taskId);
 
 
 }

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

@@ -15,5 +15,6 @@ public interface SpecialCardMapper {
     public void updateSpecialCardEntity(SpecialCardEntity specialCardEntity);
     public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo);
     public List <SpecialCardEntity> findSpecialCardList( String groupNo);
-
+    public List <SpecialCardEntity> addTuiZheng(String acceptNumber);
+    public List<SpecialCardEntity> addRemainingCard(String accept_Number);
 }

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

@@ -17,7 +17,7 @@ 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},'')")
+            "VALUES (PERMISSION_seq.nextval,0,#{name},'0','0/',#{permission},#{resource_type},#{url})")
     public void addPermissionByMap(SysPermission sysPermission);
 
     /**

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

@@ -17,10 +17,11 @@ public interface TaskMapper {
     public  int updateTaskEntity(TaskEntity taskEntity);
     public  List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo);
     public List<TaskEntity> findTaskEntityByState(int state);
-    public int replaceExceptionInformation(TaskEntity taskEntity);
+    public  int updateTaskIsException(@Param("taskId") String taskId,@Param("exceptionInformation") String exceptionInformation,@Param("isException")String isException);
+    public int replaceExceptionInformation(@Param("taskId")String taskId,@Param("isException")String isException);
     public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
     public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
-    public int updateOutStorageDate(String taskListId);
-    public int updateInStorageDate(String taskListId);
-    public int updateStorageDate(String taskListId);
+    public int updateOutStorageDate(String taskId);
+    public int updateInStorageDate(String taskId);
+    public int updateStorageDate(String taskId);
 }

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

+package com.yxproject.start.service;
+
+import com.yxproject.start.entity.SpecialCardEntity;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/12/21.
+ */
+public interface AddRemainingCardService {
+    public List<SpecialCardEntity>getRemainingCardData(String accept_Number);
+}

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

+package com.yxproject.start.service;
+
+import com.yxproject.start.entity.SpecialCardEntity;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/12/20.
+ */
+public interface AddTuiZhengService {
+    public List<SpecialCardEntity>getTuiZhengData(String acceptNumber);
+}

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

@@ -8,6 +8,6 @@ import java.util.Map;
 
 public interface CountyListService {
 
-    public List<CountyListEntity> findStorageCountByTaskListId(String taskListId);
-    public int reviseStorageCount(String taskListId,String countyCode, String in_Storage_Count, String out_Storage_Count);
+    public List<CountyListEntity> findStorageCountByTaskId(String taskId);
+    public int reviseStorageCount(String taskId,String countyCode, String inStorageCount, String outStorageCount);
 }

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

@@ -8,7 +8,7 @@ import java.util.List;
  * Created by Administrator on 2018/12/19.
  */
 public interface CountyService {
-    public List<CountyEntity> findCountyList( String taskListId,String taskStateId,String cardType);
+    public List<CountyEntity> findCountyList( String taskId);
 
 
 }

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

 package com.yxproject.start.service;
 
+import com.yxproject.start.entity.FindStationCountByViewEntity;
+
 import java.util.List;
 import java.util.Map;
 
@@ -7,5 +9,5 @@ import java.util.Map;
  * Created by Administrator on 2018/11/29.
  */
 public interface FindStationCountService {
-    public List<Map<String,Object>>getStationCountData(String submitDate,String state);
+    public List<FindStationCountByViewEntity>getStationCountData(String submitDate, String state);
 }

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

@@ -9,6 +9,6 @@ import java.util.List;
  */
 
 public interface GroupListService {
-    public List<GroupListEntity> findGroupListByTaskListId( String taskListId);
+    public List<GroupListEntity> findGroupListByTaskId( String taskId);
 
 }

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

@@ -26,7 +26,7 @@ public interface TaskService {
 
     public List<Map<String,Object>> findProductionTaskListEntityByState(int state);
 
-    public int addExceptionState(TaskEntity state);
+    public int addExceptionState(String taskId, String exceptionInformation);
 
 //    public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
 

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.entity.SpecialCardEntity;
+import com.yxproject.start.mapper.SpecialCardMapper;
+import com.yxproject.start.service.AddRemainingCardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/12/21.
+ */
+@Service
+public class AddRemainingCardServiceImpl implements AddRemainingCardService{
+    @Autowired
+    private SpecialCardMapper specialCardMapper;
+    @Override
+    public List<SpecialCardEntity>getRemainingCardData(String accept_number){
+        List<SpecialCardEntity>List=specialCardMapper.addRemainingCard(accept_number);
+        return List;
+    }
+}

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.entity.SpecialCardEntity;
+import com.yxproject.start.mapper.SpecialCardMapper;
+import com.yxproject.start.service.AddTuiZhengService;
+import org.omg.CORBA.Object;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/12/20.
+ */
+@Service
+public class AddTuiZhengServiceImpl implements AddTuiZhengService {
+    @Autowired
+    private SpecialCardMapper specialCardMapper;
+
+    @Override
+    public List<SpecialCardEntity>getTuiZhengData(String acceptNumber){
+        List<SpecialCardEntity>List=specialCardMapper.addTuiZheng(acceptNumber);
+        return List;
+    }
+}

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

@@ -24,7 +24,7 @@ public class CountyListServiceImpl implements CountyListService {
     public TaskMapper taskMapper;
 
     @Override
-    public int reviseStorageCount(String taskListId,String countyCode, String in_Storage_Count, String  out_Storage_Count) {
+    public int reviseStorageCount(String taskId,String countyCode, String inStorageCount, String  outStorageCount) {
         int i = 0;
         int totalFinshCount = 0;
         int totalInStorageCount = 0;
@@ -32,22 +32,22 @@ public class CountyListServiceImpl implements CountyListService {
         totalFinshCount = countyListMapper.totalFinshCount();
         totalInStorageCount = countyListMapper.totalInStorageCount();
         totalOutStorageCount = countyListMapper.totalOutStorageCount();
-        i = countyListMapper.reviseStorageCount(taskListId, countyCode, in_Storage_Count, out_Storage_Count);
+        i = countyListMapper.reviseStorageCount(taskId, countyCode, inStorageCount, outStorageCount);
         if(totalInStorageCount == totalFinshCount){
-            taskMapper.updateInStorageDate(taskListId);
+            taskMapper.updateInStorageDate(taskId);
         }
         if(totalOutStorageCount == totalFinshCount){
-            taskMapper.updateOutStorageDate(taskListId);
+            taskMapper.updateOutStorageDate(taskId);
         }
         if(totalInStorageCount == totalFinshCount && totalOutStorageCount == totalFinshCount){
-            taskMapper.updateStorageDate(taskListId);
+            taskMapper.updateStorageDate(taskId);
         }
             return i;
     }
 
     @Override
-    public List<CountyListEntity> findStorageCountByTaskListId(String taskListId){
-        return countyListMapper.findStorageCountByTaskListId(taskListId);
+    public List<CountyListEntity> findStorageCountByTaskId(String taskId){
+        return countyListMapper.findStorageCountByTaskId(taskId);
     }
 
 

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

@@ -20,8 +20,8 @@ public class CountyServiceImpl implements CountyService {
     public CountyListMapper countyListMapper;
 
     @Override
-    public List <CountyEntity> findCountyList( String taskListId, String taskStateId, String cardType ) {
-        List<CountyEntity> county = countyListMapper.findCountyList(taskListId,taskStateId,cardType);
+    public List <CountyEntity> findCountyList( String taskId ) {
+        List<CountyEntity> county = countyListMapper.findCountyList(taskId);
         return county;
 
     }

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

 package com.yxproject.start.service.impl;
 
+import com.yxproject.start.entity.FindStationCountByViewEntity;
 import com.yxproject.start.mapper.FindStationCountMapper;
+import com.yxproject.start.mapper.TaskMapper;
 import com.yxproject.start.service.FindStationCountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,10 +17,13 @@ import java.util.Map;
 public class FindStationCountServiceImpl implements FindStationCountService {
     @Autowired
     private FindStationCountMapper findStationCountMapper;
+    @Autowired
+    private TaskMapper taskMapper;
 
     @Override
-    public List<Map<String,Object>>getStationCountData(String submitDate,String state) {
-        List<Map<String,Object>> list=findStationCountMapper.findStationCountByDealDate(submitDate,state);
+    public List<FindStationCountByViewEntity>getStationCountData(String submitDate,String state) {
+        List<FindStationCountByViewEntity> list = findStationCountMapper.findStationCountByDealDate(submitDate, state);
+//        List<Map<String, Object>> list = taskMapper.findStationCountByDealDate(submitDate, state);
         return list;
 
     }

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

@@ -22,8 +22,8 @@ public class GroupListServiceImpl implements GroupListService {
     public SpecialCardMapper specialCardMapper;
 
     @Override
-    public List<GroupListEntity> findGroupListByTaskListId( String taskListId) {
-        List <GroupListEntity> groupList=groupNoMapper.findGroupListByTaskListId(taskListId);
+    public List<GroupListEntity> findGroupListByTaskId( String taskId) {
+        List <GroupListEntity> groupList=groupNoMapper.findGroupListByTaskId(taskId);
         for ( GroupListEntity groupListEntity:groupList) {
             List <SpecialCardEntity> specialCardEntities=specialCardMapper.findSpecialCardList(groupListEntity.getGroupNo()+"");
             groupListEntity.setSpecialCardList(specialCardEntities);

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

@@ -420,15 +420,16 @@ public class TaskServiceImpl implements TaskService {
      * @return
      */
     @Override
-    public int addExceptionState(TaskEntity taskEntity) {
+    public int addExceptionState(String taskId, String exceptionInformation) {
         int i =0;
-        if(taskEntity.getException_Information()!=null) {
-            taskEntity.setIs_Exception((long)1);
-            i=taskMapper.updateTaskEntity(taskEntity);
+        String isException;
+        if(Integer.parseInt(exceptionInformation) != 0) {
+            isException =String.valueOf(1);
+            i=taskMapper.updateTaskIsException(taskId,exceptionInformation,isException);
 
         } else {
-            taskEntity.setIs_Exception((long)0);
-            i=taskMapper.replaceExceptionInformation(taskEntity);
+            isException =String.valueOf(0);
+            i=taskMapper.replaceExceptionInformation(taskId,isException);
         }
         return i;
     }

src/main/resources/application.yml

@@ -7,6 +7,11 @@ mybatis:
   #加载Mybatis配置文件
   mapper-locations: classpath:mapper/*Mapper.xml
   config-location: classpath:mapper/config/mybatis-config.xml
+#logging.level.*=DEBUG
+#logging:
+#  level:
+#    com.yx_project.start.mapper.*: debug
+#  logging.level.com.hz.controller=WARN  #控制器层
 
 #配置调度生产Oracle数据库
 spring:
@@ -16,6 +21,7 @@ spring:
          username: dahai
          password: dahai
 
+
 #配置shiro
 shiro:
    loginUrl: http://localhost:8081

src/main/resources/log4j.properties

+log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender 
+log4j.debug=true log4j.appender.stdout=org.apache.log4j.ConsoleAppender 
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout 
+log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n 
+#logger input file log4j.logger.DebugAppender.access=DEBUG 
+log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender 
+log4j.appender.DebugAppender.File=../logs/a.log 
+log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout 
+log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n 
+#logger input file log4j.logger.InfoAppender.access=INFO 
+log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender 
+log4j.appender.InfoAppender.File=../logs/b.log 
+log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout 
+log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n 
+#error log input file log4j.logger.ErrorAppender.access=ERROR 
+log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender 
+log4j.appender.ErrorAppender.File=../logs/c.log 
+log4j.appender.ErrorAppender.Append = true 
+log4j.appender.ErrorAppender.threshold = ERROR 
+log4j.appender.ErrorAppender.layout=org.apache.log4j.PatternLayout 
+log4j.appender.ErrorAppender.layout.ConversionPattern=%d{MM-dd HH:mm:ss.SSS} %c %-5p - %m%n
\ No newline at end of file

src/main/resources/mapper/CountyListMapper.xml

@@ -18,7 +18,7 @@
     SELECT  COUNTY_LIST.COUNTY_CODE,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,COUNTY_DIC.COUNTYNAME FROM  COUNTY_LIST
         LEFT JOIN TASK ON COUNTY_LIST.TASK_ID = TASK.TASK_ID
         LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
-    WHERE TASK.TASK_ID=#{taskListId} AND TASK.CARD_TYPE=#{cardType} AND TASK.TASK_STATE_ID=#{taskStateId}
+    WHERE TASK.TASK_ID=#{taskId}
     </select>
 
     <select id="getReceiptList" resultType="com.yxproject.start.entity.ReceiptListEntity" parameterType="String">
@@ -42,32 +42,32 @@
                     SELECT COUNTYNAME,SUM(TYPE_COUNT) AS XIAOJI FROM t_county GROUP BY COUNTYNAME
             )
         SELECT DECODE(GROUPING(t_total_count.COUNTYNAME),1,'总计',t_total_count.COUNTYNAME)COUNTYNAME,
-               SUM(PTZ)PTZ,
-               SUM(KZ)KZ,
-               SUM(YDKSY)YDKSY,
-               SUM(YDKSP)YDKSP,
-               SUM(YDY)YDY,
-               SUM(YDP)YDP,
-               SUM(JRZ)JRZ,
-               SUM(KSP)KSP,
-               SUM(KSY)KSY,
-               SUM(YJZ)YJZ,
-               SUM(XIAOJI)XIAOJI,
-               SUM(boxCount)boxCount
+              nvl(SUM(PTZ),0)AS PTZ ,
+              nvl(SUM(KZ),0)AS KZ,
+              nvl(SUM(YDKSY),0) AS YDKSY,
+              nvl(SUM(YDKSP),0)AS YDKSP,
+              nvl(SUM(YDY),0)AS YDY,
+              nvl(SUM(YDP),0)AS YDP,
+              nvl(SUM(JRZ),0)AS JRZ,
+              nvl(SUM(KSP),0)AS KSP,
+              nvl(SUM(KSY),0)AS KSY,
+              nvl(SUM(YJZ),0)AS YJZ,
+              SUM(XIAOJI)XIAOJI,
+              SUM(boxCount)boxCount
         FROM t_total_count,county_xiaoji WHERE t_total_count.COUNTYNAME=county_xiaoji.COUNTYNAME AND substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8) >= #{startDate} AND #{endDate} >= substr(TO_CHAR(SAVE_DATE,'yyyyMMdd'),0,8)
         GROUP BY ROLLUP(t_total_count.COUNTYNAME)
     </select>
 
-    <select id="findStorageCountByTaskListId" resultType="java.util.HashMap" parameterType="String">
+    <select id="findStorageCountByTaskId" resultType="java.util.HashMap" parameterType="String">
      SELECT TASK_ID,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,CITY_DIC.CITYNAME||' '||COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE FROM COUNTY_LIST
          LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
          LEFT JOIN CITY_DIC ON substr(CITY_DIC.CITYCODE,1,4) = substr(COUNTY_LIST.COUNTY_CODE,1,4)
-     WHERE TASK_ID=#{task_Id}
+     WHERE TASK_ID=#{taskId}
     </select>
 
 
     <insert id="reviseStorageCount" parameterType="String" >
-        INSERT INTO COUNTY_LIST (TASK_ID,COUNTY_CODE,IN_STORAGE_COUNT,OUT_STORAGE_COUNT) VALUES ( #{taskListId},#{countyCode},#{in_Storage_Count},#{out_Storage_Count} )
+        INSERT INTO COUNTY_LIST (TASK_ID,COUNTY_CODE,IN_STORAGE_COUNT,OUT_STORAGE_COUNT) VALUES ( #{taskId},#{countyCode},#{inStorageCount},#{outStorageCount} )
     </insert>
 
     <select id="totalFinshCount" resultType="Integer">

src/main/resources/mapper/FindStationCountMapper.xml

@@ -3,9 +3,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxproject.start.mapper.FindStationCountMapper">
     <resultMap id="FindStationCountMapper" type="com.yxproject.start.entity.FindStationCountByViewEntity">
-        <id column="SUBMIT_DATE" property="submit_Date"  jdbcType="VARCHAR"/>
+        <id column="SUBMIT_DATE" property="submit_Date" jdbcType="VARCHAR"/>
         <result column="SHUJUHEYAN" property="shujuheyan" jdbcType="NUMERIC"/>
-        <result column="DAYINFENPEI" property="dayinfenpei"  jdbcType="NUMERIC"/>
+        <result column="DAYINFENPEI" property="dayinfenpei" jdbcType="NUMERIC"/>
         <result column="XIEZAIDAYIN" property="xiezaidayin" jdbcType="NUMERIC"/>
         <result column="CHEJIANYUDINGWEI" property="chejianyudingwei" jdbcType="NUMERIC"/>
         <result column="CHEJIANZHUANCHU" property="chejianzhuanchu" jdbcType="NUMERIC"/>
@@ -15,8 +15,9 @@
         <result column="APPLY_COUNT" property="applyCount" jdbcType="NUMERIC"/>
 
     </resultMap>
-    <select id="findStationCountByDealDate" resultType="java.util.HashMap" parameterType="String">
-       SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate}  AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}
+    <select id="findStationCountByDealDate" resultType="com.yxproject.start.entity.FindStationCountByViewEntity"
+            parameterType="String">
+      SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate}  AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}
     </select>
 
 </mapper>
\ No newline at end of file

src/main/resources/mapper/GroupNoMapper.xml

@@ -43,10 +43,10 @@
         SELECT * FROM  TABLE(find_normal_county_list.GET_county_infos(#{task_Id}))
     </select>
 
-    <select id="findGroupListByTaskListId" resultType="com.yxproject.start.entity.GroupListEntity" parameterType="String">
+    <select id="findGroupListByTaskId" resultType="com.yxproject.start.entity.GroupListEntity" parameterType="String">
         select GROUP_NO as groupNo,sum(VALID_COUNT) as validCount,sum(INVALID_COUNT) as invalidCount,sum(SPECIAL_CARD_COUNT) as specialCardCount from (select sum(VALID_COUNT),sum(INVALID_COUNT),sum(SPECIAL_CARD_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT ) GROUP_NO
           left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID
-        where TASK.TASK_ID=#{task_Id}
+        where TASK.TASK_ID=#{taskId}
         group by GROUP_NO
     </select>
 

src/main/resources/mapper/SpecialCardMapper.xml

@@ -34,4 +34,11 @@
         SELECT * FROM SPECIAL_CARD LEFT JOIN  GROUP_NO ON GROUP_NO.GROUP_NO = SPECIAL_CARD.GROUP_NO WHERE GROUP_NO.GROUP_NO=#{group_No}
     </select>
 
+    <select id="addTuiZheng" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
+        INSERT INTO SPECIAL_CARD (ACCEPT_NO, TASK_ID, SPECIAL_TYPE,GROUP_NO) VALUES (#{acceptNumber},(SELECT TASK_ID FROM GROUP_NO WHERE GROUP_NO.GROUP_NO=SUBSTR(#{acceptNumber},1,8)),2,SUBSTR(#{acceptNumber},1,8))
+    </select>
+
+    <select id="addRemainingCard" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
+        INSERT INTO SPECIAL_CARD (ACCEPT_NO, TASK_ID, SPECIAL_TYPE,GROUP_NO) VALUES (#{accept_Number},(SELECT TASK_ID FROM GROUP_NO WHERE GROUP_NO.GROUP_NO=SUBSTR(#{accept_Number},1,8)),0,SUBSTR(#{accept_Number},1,8))
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/TaskMapper.xml

@@ -68,20 +68,24 @@
     select * from TASK  where TASK_STATE_ID =#{task_State_Id}
     </select>
 
-    <update id="replaceExceptionInformation" parameterType="com.yxproject.start.entity.TaskEntity" >
-    update TASK set exception_Information = NULL and IS_EXCEPTION =#{is_Exception} where TASK_ID =#{task_Id}
+    <update id="updateTaskIsException" parameterType="String" >
+    update TASK set EXCEPTION_INFORMATION = #{exceptionInformation},IS_EXCEPTION = #{isException} where TASK_ID =#{taskId}
+    </update>
+
+    <update id="replaceExceptionInformation" parameterType="String" >
+    update TASK set EXCEPTION_INFORMATION = NULL,IS_EXCEPTION = #{isException} where TASK_ID =#{taskId}
     </update>
 
     <update id="updateOutStorageDate">
-        UPDATE TASK SET OUT_STORAGE_DATE = SYSDATE WHERE TASK_ID = #{taskListId}
+        UPDATE TASK SET OUT_STORAGE_DATE = SYSDATE WHERE TASK_ID = #{taskId}
     </update>
 
     <update id="updateInStorageDate" >
-        UPDATE TASK SET IN_STORAGE_DATE = SYSDATE WHERE TASK_ID = #{taskListId}
+        UPDATE TASK SET IN_STORAGE_DATE = SYSDATE WHERE TASK_ID = #{taskId}
     </update>
 
     <update id="updateStorageDate" >
-        UPDATE TASK SET IN_STORAGE_DATE = SYSDATE , OUT_STORAGE_DATE = SYSDATE WHERE TASK_ID = #{taskListId}
+        UPDATE TASK SET IN_STORAGE_DATE = SYSDATE , OUT_STORAGE_DATE = SYSDATE WHERE TASK_ID = #{taskId}
     </update>
 
     <select id="findTypeListByTaskStateId" resultType="com.yxproject.start.entity.TypeListEntity" parameterType="String">
@@ -92,11 +96,17 @@
     </select>
 
     <select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity">
-        SELECT CARD_TYPE,TASK.CITYCODE,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,GROUP_NO AS groupNo,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID from (select sum(VALID_COUNT),sum(INVALID_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT ) GROUP_NO
+        SELECT CARD_TYPE AS cardType,TASK.CITYCODE AS citycode,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,GROUP_NO AS groupNo,TASK.TASK_ID AS taskId,OLD_CARD_TYPE AS oldCardType,SUBMIT_DATE AS submitDate,ISSUED_DATE AS issuedDate,PRINT_STATE AS printState,DOWNLOAD_DATE AS downloadDate,PRINT_OUT_DATE AS printOutDate,POSITION_DATE AS positionDate,OUT_WORKSHOP_DATE AS outWorkshopDate,QUALITY_PEOPLE_NAME AS qualityPeopleName,QUALITY_TEST_DATE AS qualityTestDate,EXCEPTION_INFORMATION AS exceptionInformation,OUT_STORAGE_DATE AS outStorageDate,IN_STORAGE_DATE AS inStorageDate,TASK_STATE_ID AS taskStateId,IS_EXCEPTION AS isException,PRINTER_ID AS printerId
+        from (select sum(VALID_COUNT),sum(INVALID_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT ) GROUP_NO
         left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID
         left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on CITY_DIC.CITYCODE = TASK.CITYCODE
         where CARD_TYPE=#{cardType} and TASK_STATE_ID = #{taskStateId}
         GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,GROUP_NO,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID
     </select>
 
+
+    <select id="findStationCountByDealDate" resultType="java.util.HashMap" parameterType="String">
+        SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate}  AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -19,4 +19,10 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
         <!--</plugin>-->
 
     <!--</plugins>-->
+    <!--<settings>-->
+
+        <!--<setting name="log4jImpl" value="LOG4J"/>-->
+    <!--</settings>-->
+
+
 </configuration>
\ No newline at end of file

src/main/resources/static/dialogs/specialCardList.html

@@ -12,10 +12,10 @@
                     </thead>
                     <tbody>
                     <tr ng-repeat="specialCard in specialCardList">
-                        <td>{{specialCard.acceptNo}}</td>
-                        <td ng-if="specialCard.specialType==0">余证</td>
-                        <td ng-if="specialCard.specialType==1">快证</td>
-                        <td ng-if="specialCard.specialType==2">退证</td>
+                        <td>{{specialCard.accept_No}}</td>
+                        <td ng-if="specialCard.special_Type==0">余证</td>
+                        <td ng-if="specialCard.special_Type==1">快证</td>
+                        <td ng-if="specialCard.special_Type==2">退证</td>
                     </tr>
                     </tbody>
                 </table>

src/main/resources/static/dialogs/updatePerms.html

@@ -7,6 +7,10 @@
             <label>名称</label>
             <input type="text" class="form-control" ng-model="thisPerm.name" ng-value="thisPerm.name" required>
         </div>
+        <div class="form-group">
+            <label>路径</label>
+            <input type="text" class="form-control" ng-model="thisPerm.url" ng-value="thisPerm.url"  required >
+        </div>
         <div class="form-group">
             <label>权限字符串</label>
             <input type="text" class="form-control" ng-model="thisPerm.permission" ng-value="thisPerm.permission"

src/main/resources/static/dialogs/updateUser.html

@@ -14,11 +14,11 @@
         <div class="form-group pull-in clearfix" ng-if="thisUser.username!='admin'">
             <div class="col-sm-6">
                 <label>角色</label>
-                <select class="form-control w-md" ng-model="roleId" ng-options="role.id as role.role for role in activeRoleList"></select>
+                <select class="form-control w-md" ng-model="thisUser.roleId" ng-options="role.id as role.role for role in activeRoleList"></select>
             </div>
         </div>
     </form>
 </div>
 <div class="ui-dialog-confirm">
-    <button type="submit" class="btn btn-info" ng-click="userUpdate(roleId)&&closeThisDialog()">确认修改</button>
+    <button type="submit" class="btn btn-info" ng-click="userUpdate()&&closeThisDialog()">确认修改</button>
 </div>
\ No newline at end of file

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

@@ -381,12 +381,13 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
-            getTypeListByTaskStateId:function(state,success){
+            getTypeListByTaskStateId:function(userState,success){
+			    console.log('----测试查询代码----',userState)
                 $http({
                     method: 'GET',
                     url: "../user/getTypeListByTaskStateId" + urlTimeStamp(),
                     params:{
-                        taskStateId:state
+                        taskStateId:userState
                     }
                 }).then(function successCallback(response) {
                     success(response.data)
@@ -398,9 +399,9 @@ app.service('MessageService', function (ngDialog) {
             getCityListByCardType:function(cardType,state,success){
                 $http({
                     method: 'GET',
-                    url: "../user/getCityListByCardType" + urlTimeStamp(),
+                    url: "../user/getCityList" + urlTimeStamp(),
                     params:{
-                        state:state,
+                        taskStateId:state,
                         cardType:cardType
                     }
                 }).then(function successCallback(response) {
@@ -413,9 +414,9 @@ app.service('MessageService', function (ngDialog) {
             getGroupNoByTaskListId:function(taskStateId,success){
                 $http({
                     method: 'GET',
-                    url: "../user/getGroupNoByTaskListId" + urlTimeStamp(),
+                    url: "../user/getGroupListByTaskId" + urlTimeStamp(),
                     params:{
-                        taskStateId:taskStateId
+                        taskId:taskStateId
                     }
                 }).then(function successCallback(response) {
                     success(response.data)
@@ -427,9 +428,9 @@ app.service('MessageService', function (ngDialog) {
             getCountyListByTaskListId:function(taskStateId,success){
                 $http({
                     method: 'GET',
-                    url: "../user/getCountyListByTaskListId" + urlTimeStamp(),
+                    url: "../user/getCountyList" + urlTimeStamp(),
                     params:{
-                        taskStateId:taskStateId
+                        taskId:taskStateId
                     }
                 }).then(function successCallback(response) {
                     success(response.data)
@@ -441,7 +442,7 @@ app.service('MessageService', function (ngDialog) {
             updateProductionTask:function(taskId,state,success){
                 $http({
                     method: 'GET',
-                    url: "../user/updateProductionTask" + urlTimeStamp(),
+                    url: "../user/updateTaskState" + urlTimeStamp(),
                     params:{
                         taskId:taskId,
                         state:state
@@ -471,12 +472,13 @@ app.service('MessageService', function (ngDialog) {
             getReceiptData:function(startTime, endTime,success){
                 $http({
                     method: 'GET',
-                    url: "../user/getConnectList" + urlTimeStamp(),
+                    url: "../user/getReceiptList" + urlTimeStamp(),
                     params:{
-                        startTime:startTime,
-                        endTime:endTime
+                        startDate:startTime,
+                        endDate:endTime
                     }
                 }).then(function successCallback(response) {
+                    console.log(response.data,"-------------response.data------")
                     success(response.data)
                 },function(err){
                     var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
@@ -486,10 +488,10 @@ app.service('MessageService', function (ngDialog) {
             getprintReceipt:function(startTime, endTime,success){
                 $http({
                     method: 'GET',
-                    url: "../user/getConnectList" + urlTimeStamp(),
+                    url: "../user/printReceiptList" + urlTimeStamp(),
                     params:{
-                        startTime:startTime,
-                        endTime:endTime
+                        startDate:startTime,
+                        endDate:endTime
                     }
                 }).then(function successCallback(response) {
                     success(response.data)

src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html

@@ -59,7 +59,7 @@
                                 </thead>
                                 <tbody ng-repeat="city in cityList| orderBy:citycode:desc">
                                 <tr>
-                                    <td>{{city.task_Id}}</td>
+                                    <td>{{city.taskId}}</td>
                                     <td><span class="city"
                                               style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td>
                                     <td>{{city.groupCount}}</td>
@@ -70,14 +70,14 @@
                                         <span style="padding-left:10px;"
                                               ng-show="city.printer_Id==null">未分配</span>
                                         <span style="padding-left:10px;"
-                                              ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span>
+                                              ng-show="city.printer_Id!=null">机器<span>{{city.printerId}}</span></span>
                                     </td>
                                     <td>{{city.state}}</td>
-                                    <td ng-if="userState<=4"><a ng-click="showTable(city.task_Id)">组号列表</a></td>
-                                    <td ng-if="userState>4"><a ng-click="showTable(city.task_Id)">区县列表</a></td>
-                                    <td><a ng-click="finishClick(city.task_Id,userState)">完成</a></td>
+                                    <td ng-if="userState<=4"><a ng-click="showTable(city.taskId)">组号列表</a></td>
+                                    <td ng-if="userState>4"><a ng-click="showTableCounty(city.taskId)">区县列表</a></td>
+                                    <td><a ng-click="finishClick(city.taskId,userState)">完成</a></td>
                                 </tr>
-                                <tr ng-show="showtable==city.task_Id && userState<=4">
+                                <tr ng-show="showtable==city.taskId && userState<=4">
                                     <td></td>
                                     <td colspan="4">
                                         <table style="font-size:0.9em;color: #000;" class="table">
@@ -90,9 +90,9 @@
                                             </thead>
                                             <tbody>
                                             <tr ng-repeat="group in groupList">
-                                                <td>{{group.groupNO}}</td>
-                                                <td>{{group.vaildCount}}</td>
-                                                <td>{{group.invaildCount}}</td>
+                                                <td>{{group.groupNo}}</td>
+                                                <td>{{group.validCount}}</td>
+                                                <td>{{group.invalidCount}}</td>
                                                 <td>{{group.specialCardCount}}</td>
                                                 <td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
                                             </tr>
@@ -101,7 +101,7 @@
                                     </td>
                                 </tr>
 
-                                <tr ng-show="showtable==city.task_Id && userState>4">
+                                <tr ng-show="showtableCounty==city.taskId && userState>4">
                                     <td></td>
                                     <td colspan="4">
                                         <table style="font-size:0.9em;color: #000;" class="table">

src/main/resources/static/tpl/layout/receipt/receipt.html

@@ -10,53 +10,67 @@
             <input type="text" ng-model="nowDate" value="currentDetailDate" id="wdate2" class="Wdate"  onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm',autoPickDate:'true'})">
             <input type="submit" class="btn btn-primary" value="查询" ng-click="myClick()">
         </div>
+        <div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">
+            <div>
+                <div ng-if="receiptData.length>0">
+                    <table class="table table-hover" style="margin-top:10px;">
+                        <thead>
+                        <th></th>
+                        <th>普通证</th>
+                        <!--<th><a ng-click="showSpecialCardInfo()">快证</a></th>-->
+                        <th>快证</th>
+                        <th>异地KS邮</th>
+                        <th>异地KS普</th>
+                        <th>异地邮</th>
+                        <th>异地普</th>
+                        <th>军人证</th>
+                        <th>KS普</th>
+                        <th>KS邮</th>
+                        <th>邮寄证</th>
+                        <th>小计</th>
+                        <th>盒数</th>
+                        </thead>
+                        <tbody>
+                        <tr ng-repeat="county in receiptData">
+                            <td width="100px">{{county.countyName}}</td>
+                            <td width="100px">{{county.PTZ}}</td>
+                            <td width="100px">{{county.KZ}}</td>
+                            <td width="100px">{{county.YDKSY}}</td>
+                            <td width="100px">{{county.YDKSP}}</td>
+                            <td width="100px">{{county.YDY}}</td>
+                            <td width="100px">{{county.YDP}}</td>
+                            <td width="100px">{{county.JRZ}}</td>
+                            <td width="100px">{{county.KSP}}</td>
+                            <td width="100px">{{county.KSY}}</td>
+                            <td width="100px">{{county.YJZ}}</td>
+                            <td width="100px">{{county.sum}}</td>
+                            <td width="100px">{{county.boxCount}}</td>
+
+                            <!--<td width="100px" ng-repeat="item in county track by $index" ng-if="$index!=12 && $index!=13">-->
+                                <!--<span ng-if="item!=0">{{item}}</span>-->
+                                <!--<span ng-if="item==0"></span>-->
+                            <!--</td>-->
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <div ng-if="receiptData.length==0" style="font-size:1.5em;">
+                    当天暂无报表数据。
+                </div>
+                <div ng-if="receiptData.length!=0" style="font-size:1.5em;">
+                    <input type="button" class="btn btn-primary" value="下载交接单" ng-click="printReceipt()">
+                    <input type="button" class="btn btn-primary" value="下载回执单" ng-click="printOfficialReceipt()">
+                </div>
+            </div>
+        </div>
+
     </div>
 </div>
-    <div class="loading">
-        <span></span>
-        <span></span>
-        <span></span>
-        <span></span>
-        <span></span>
-    </div>
+    <!--<div class="loading">-->
+        <!--<span></span>-->
+        <!--<span></span>-->
+        <!--<span></span>-->
+        <!--<span></span>-->
+        <!--<span></span>-->
+    <!--</div>-->
 </div>
-<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">
-    <div>
-        <div ng-if="receiptData.length>0">
-            <table class="table table-hover" style="margin-top:10px;">
-                <thead>
-                <th></th>
-                <th>普通证</th>
-                <!--<th><a ng-click="showSpecialCardInfo()">快证</a></th>-->
-                <th>快证</th>
-                <th>异地KS邮</th>
-                <th>异地KS普</th>
-                <th>异地邮</th>
-                <th>异地普</th>
-                <th>军人证</th>
-                <th>KS普</th>
-                <th>KS邮</th>
-                <th>邮寄证</th>
-                <th>小计</th>
-                <th>盒数</th>
-                </thead>
-                <tbody>
-                <tr ng-repeat="county in receiptData">
-                    <td width="100px">{{county[12]}}</td>
-                    <td width="100px" ng-repeat="item in county track by $index" ng-if="$index!=12 && $index!=13">
-                        <span ng-if="item!=0">{{item}}</span>
-                        <span ng-if="item==0"></span>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-        <div ng-if="receiptData.length==0" style="font-size:1.5em;">
-            当天暂无报表数据。
-        </div>
-        <div ng-if="receiptData.length!=0 && receiptData[0][11] != 0" style="font-size:1.5em;">
-            <input type="button" class="btn btn-primary" value="下载交接单" ng-click="printReceipt()">
-            <input type="button" class="btn btn-primary" value="下载回执单" ng-click="printOfficialReceipt()">
-        </div>
-    </div>
-</div>
\ No newline at end of file

src/main/resources/static/tpl/layout/receipt/receipt.js

@@ -30,8 +30,10 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
         return currentdate;
     }
     $scope.currentDetailDate = getNowFormatDetailDate();
-    $scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00")
-    $scope.nowDate = new Date().format("yyyy-MM-dd hh:mm");
+    // $scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00");
+    var date = new Date();
+    $scope.nowDataEight = $filter('date')(date,"yyyy-MM-dd 08:00");
+    $scope.nowDate = $filter('date')(date,"yyyy-MM-dd hh:mm");
 
     var changeDataFormat = function (date) {
         var yyyyMMdd = date.split(" ")[0];
@@ -43,12 +45,11 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
         var mm = hhmm.split(":")[1];
         return yyyy + MM + dd + hh + mm;
     }
-
+    $scope.receiptData =[];
     var getReceiptData = function (startTime, endTime) {
-
         HttpService.getReceiptData(startTime, endTime, function (data) {
             $scope.receiptData = data.respData;
-            console.log($scope.receiptData)
+
         })
     }
     getReceiptData(changeDataFormat($scope.nowDataEight), changeDataFormat($scope.nowDate))

src/main/resources/static/tpl/layout/yieldReport/yieldReport.js

@@ -5,7 +5,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
     } else {
         $state.go("layout.yieldReport")
     }
-    $scope.userState = $rootScope.loginData.state;
+    $scope.userState = $rootScope.workshop;
     // $scope.userState=5;
 
 
@@ -48,10 +48,10 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
     $scope.month_last = getMonthLastDay();
 
     var getQualityReport = function (startDate, endDate) {
-        HttpService.getQualityReport(startDate, endDate, function (data) {
-            $scope.dataCheckData = data.respData;
-            console.log("初始化数据核验质量报表：", $scope.dataCheckData)
-        })
+        // HttpService.getQualityReport(startDate, endDate, function (data) {
+        //     $scope.dataCheckData = data.respData;
+        //     console.log("初始化数据核验质量报表：", $scope.dataCheckData)
+        // })
     }
     //初始化数据核验报表
     if ($rootScope.loginData.state == 1 || $rootScope.loginData.state == 0) {
@@ -89,7 +89,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
             })
         }
         if ($rootScope.loginData.state == 0) {
-            HttpService.getAdminPrintData(startDate, endDate, $scope.state.substring(1, 2), function (data) {
+            HttpService.getAdminPrintData(startDate, endDate, $scope.userState, function (data) {
                 $scope.printDataReport = data.respData;
                 console.log("初始化打印卸载报表：", $scope.printDataReport)
             })
@@ -128,23 +128,23 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
     }
 
     var getQualityCheckReport = function (month) {
-        if ($rootScope.loginData.state == 6) {
-            HttpService.getQualityCheckReportData(month, function (data) {
-                $scope.qulityCheckData = data.respData;
-                console.log("质检报表：", $scope.qulityCheckData)
-            })
-        }
-        if ($rootScope.loginData.state == 0) {
-            HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
-                $scope.qulityCheckData = data.respData;
-                console.log("质检报表：", $scope.qulityCheckData)
-            })
-        }
+        // if ($rootScope.loginData.state == 6) {
+        //     HttpService.getQualityCheckReportData(month, function (data) {
+        //         $scope.qulityCheckData = data.respData;
+        //         console.log("质检报表：", $scope.qulityCheckData)
+        //     })
+        // }
+        // if ($rootScope.loginData.state == 0) {
+        //     HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
+        //         $scope.qulityCheckData = data.respData;
+        //         console.log("质检报表：", $scope.qulityCheckData)
+        //     })
+        // }
 
     }
-    if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
-        getQualityCheckReport($scope.nowMonth)
-    }
+    // if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
+    //     getQualityCheckReport($scope.nowMonth)
+    // }
 
     $scope.printQualityCheckReport = function () {
         var month = $("#wdateZj").val()