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

src/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/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/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/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/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/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/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/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/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/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/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

@@ -99,4 +99,9 @@
         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/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