Commit 55aaa3e5 authored by wuzhilong's avatar wuzhilong

搜索框查询时上传受理单位为空

parent c782a027
......@@ -213,7 +213,7 @@ public class LogApi {
*/
@RequestMapping("deleteFiles")
@Transactional(rollbackFor = Exception.class)
public boolean deleteFiles(@RequestParam("uploadTime")String uploadTime, HttpServletRequest requ) {
public Map<String, Object> deleteFiles(@RequestParam("uploadTime")String uploadTime, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String, Object> map = null;
......@@ -231,8 +231,10 @@ public class LogApi {
}catch (Exception e){
logger.error("导入时间:" + uploadTime);
logger.error("Exception 解析异常", e);
map.put("state", 2);
map.put("msg", "出现错误,删除失败!");
}
return true;
return map;
}
/**
......
......@@ -43,6 +43,7 @@ public interface GroupNoMapper {
/**
* 查询组号列表
* 受理库
* 包号21位,港澳6,台湾7,异地8
* @param groupNo 组号信息
* @return
*/
......
......@@ -153,7 +153,7 @@ public interface LogMapper {
@Select("select id from files where TO_CHAR(UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss') = #{uploadTime}")
@Select("select id from files where TO_CHAR(UPLOAD_DATE,'yyyymmddhh24miss') = #{uploadTime}")
public List<String> selectId(@Param("uploadTime")String uploadTime);
@Delete("DELETE FROM (SELECT * FROM PREPRO_PERSON_CLOB LEFT JOIN PREPRO_PERSON ON PREPRO_PERSON_CLOB.ID = PREPRO_PERSON.ID WHERE PREPRO_PERSON.FILE_ID = #{id})")
......
......@@ -144,7 +144,7 @@ public interface SelectSerialNumberMapper {
"ACC_CARD_T.NAME,\n" +
"ACC_CARD_T.ID_NO,\n" +
"ACC_CARD_T.SEX_NO,\n" +
// "PU.UNIT_NAME AS GAJG1,\n" +
"AU.UNIT_NAME AS GAJG1,\n" +
"ACC_CARD_T.BEGIN_DATE,\n" +
"decode(ACC_CARD_T.EXPIRE_DATE,'00000000','长期',ACC_CARD_T.EXPIRE_DATE) EXPIRE_DATE,\n" +
"ACC_CARD_T.SIGN_GOVT POLICE_NAME\n" +
......@@ -161,7 +161,7 @@ public interface SelectSerialNumberMapper {
"PROD_CARD_T.ID_NO,PROD_CARD_T.SEX_NO,\n" +
"decode(CHECK_DATE, null,decode(ELECTRIC_WRITE_DATE, null,decode(DOWNLOAD_DATE, null,1,2,5)),6) state,\n" +
"decode(CHECK_DATE, null,decode(ELECTRIC_WRITE_DATE, null,decode(DOWNLOAD_DATE, null,EXPORT_DATE,DOWNLOAD_DATE,ELECTRIC_WRITE_DATE)),CHECK_DATE) Last_date,\n" +
// "PU.UNIT_NAME AS GAJG1," +
"AU.UNIT_NAME AS GAJG1," +
"PROD_CARD_T.BEGIN_DATE,decode(PROD_CARD_T.EXPIRE_DATE,'00000000','长期',PROD_CARD_T.EXPIRE_DATE) EXPIRE_DATE ,PROD_CARD_T.SIGN_GOVT police_NAME FROM PRODYD_DBA.PROD_CARD_T@PRODYD_LINK\n" +
"LEFT JOIN COUNTY_DIC ON subStr(PROD_CARD_T.UPLOAD_NO,0,6)=COUNTY_DIC.COUNTY_CODE\n" +
"LEFT JOIN GROUP_NO ON subStr(PROD_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO\n" +
......
......@@ -18,6 +18,7 @@ public interface TaskListMapper {
/**
* 任务单查询
* 受理库
* 包号21位,港澳6,台湾7,异地8
* @param submitDate
* @return
*/
......
......@@ -6,6 +6,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<settings>
<setting name="mapUnderscoreToCamelCase" value="true"/>
<setting name="callSettersOnNulls" value="true"/>
<setting name="logImpl" value="STDOUT_LOGGING" />
<!--<setting name="logImpl" value="STDOUT_LOGGING" />-->
</settings>
</configuration>
\ No newline at end of file
......@@ -86,7 +86,7 @@
<!-- logo for regular state and mobile devices -->
<span class="logo-lg">
<span ng-if="loginData.roleList[0].process!=8">异地制证辅助平台</span>
<span ng-if="loginData.roleList[0].process==8">邮政速递业务管理系统</span>
<span ng-if="loginData.roleList[0].process==8">异地证邮政速递业务管理子系统</span>
</span>
</a>
<!-- Header Navbar: style can be found in header.less -->
......
......@@ -72,7 +72,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.analysis = function (uploadDate,packageCount) {
ngDialog.open({
template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
width: 876,
width: 977,
cache: false,
controller: ['$scope','HttpService', function ($scope,HttpService) {
$scope.wrongMsg = -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment