merge 档案管理

atms-api/src/main/java/pwc/taxtech/atms/common/util/DateUtils.java

@@ -109,6 +109,21 @@ public class DateUtils {
         return dateString;
     }
 
+    /**
+     * 根据yyyyMMdd时间格式字符串,格式化为date类型
+     *
+     * @param dateStr
+     * @return
+     */
+    public static Date stringToDate4yyyyMMdd(String dateStr) {
+        try {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+            Date date = formatter.parse(dateStr);
+            return date;
+        } catch (ParseException e) {
+            return null;
+        }
+    }
     /**
      * 将短时间格式字符串转换为区间格式 yyyyMM
      *

atms-api/src/main/java/pwc/taxtech/atms/controller/TaxDocumentController.java

@@ -105,6 +105,13 @@ public class TaxDocumentController {
         }
         return taxDocumentService.editFilesType(taxDocument);
     }
+
+    @GetMapping("/multipalInitData")
+    @ResponseBody
+    public Map<String,Object> multipalInitData(String address){
+        //地址示例: D://multipaiInitData
+        return taxDocumentService.multipalInitData(address);
+    }
     @RequestMapping("exportExcel")
     @ResponseBody
     public void exportExcelFile(HttpServletResponse response, @RequestBody TaxDocumentDto taxDocumentDto) {

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/TaxDocumentMapper.xml

@@ -67,7 +67,6 @@
                     </trim>
                 </if>
             </foreach>
-            and enable = 'T'
         </where>
     </sql>
     <sql id="Update_By_Example_Where_Clause">
@@ -151,13 +150,16 @@
         where id = #{id,jdbcType=BIGINT}
     </delete>
 
-    <delete id="batchDelete">
-        DELETE FROM tax_document
+    <update id="batchDelete">
+        UPDATE tax_document
+        SET
+        enable = 'F'
         WHERE id IN
         <foreach collection="list" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
-    </delete>
+        AND enable = 'T'
+    </update>
 
     <delete id="deleteByExample" parameterType="pwc.taxtech.atms.entity.TaxDocumentExample">
         <!--

atms-web/src/main/webapp/app-resources/i18n/en-us/taxDocumentList.json

@@ -56,5 +56,6 @@
   "PreviewFile":"PreviewFile",
   "UploadSuccessCount":"UploadSuccessCount",
   "UploadFailCount":"UploadFailCount",
-  "DeleteConfirm":"DeleteConfirm"
+  "DeleteConfirm":"DeleteConfirm",
+  "FileTimeDateRangeError":"FileTimeDateRangeError"
 }
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/zh-CN/taxDocumentList.json

@@ -55,7 +55,8 @@
   "Edit":"编辑",
   "DocumentPath":"档案路径",
   "PreviewFile":"预览文件",
-  "UploadSuccessCount":"个档案上传成功",
-  "UploadFailCount":"个档案上传失败",
-  "DeleteConfirm":"是否确认删除记录？"
+  "UploadSuccessCount":"个档案上传成功:",
+  "UploadFailCount":"个档案上传失败:",
+  "DeleteConfirm":"是否确认删除记录？",
+  "FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'"
 }
\ No newline at end of file

atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js

@@ -11,6 +11,14 @@ frameworkModule.controller('appUsrOperateLogController',
 
             $scope.loadMainData = function () {
                 $scope.thisModuleId = $scope.thisModuleId ? $scope.thisModuleId : [];
+                if($scope.thisModuleId.length===0){
+                    $("input[name='dataGridCheckBox']").each(function (index, item) {
+                        if (item.checked) {
+                            var cellId = $(item).attr("data-id");
+                            $scope.thisModuleId.push(cellId);
+                        }
+                    });
+                }
                 var config = {
                     // params: {
                     "ids":$scope.thisModuleId
@@ -21,6 +29,7 @@ frameworkModule.controller('appUsrOperateLogController',
                         SweetAlert.warning("没有数据可以下载");
                         return;
                     }
+                    $scope.thisModuleId=[];//清空查询id
                     $scope.dataGridUpdate(data);
                 })
             };