1、数据校验日志

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

@@ -219,11 +219,11 @@ public class DataImportController extends BaseController {
         return new CamelPagingResultDto<>(dataImportService.displayImportLog(param));
     }
 
-/*    @ResponseBody
+    @ResponseBody
     @RequestMapping(value = "displayProcessLog", method = RequestMethod.POST)
-    public CamelPagingResultDto<DataProcessLogDto> displayProcessLog(@RequestBody DataProcessParam param) {
+    public CamelPagingResultDto<DataValidateLogDto> displayProcessLog(@RequestBody DataProcessParam param) {
         return new CamelPagingResultDto<>(dataImportService.displayProcessLog(param));
-    }*/
+    }
 
     @ResponseBody
     @RequestMapping(value = "callExtractFinancialData", method = RequestMethod.POST)

atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java

@@ -23,8 +23,10 @@ import pwc.taxtech.atms.dao.*;
 import pwc.taxtech.atms.dpo.OrgSelectDto;
 import pwc.taxtech.atms.dto.DataExtractParam;
 import pwc.taxtech.atms.dto.DataImportLogDto;
+import pwc.taxtech.atms.dto.DataValidateLogDto;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.dataimport.DataImportParam;
+import pwc.taxtech.atms.dto.dataimport.DataProcessParam;
 import pwc.taxtech.atms.dto.vatdto.TrialBalanceDto;
 import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
 import pwc.taxtech.atms.entity.*;
@@ -55,6 +57,8 @@ public class DataImportService extends BaseService {
     @Resource
     private DataImportLogMapper dataImportLogMapper;
     @Resource
+    private DataValidateLogMapper dataValidateLogMapper;
+    @Resource
     private ProfitLossStatementMapper profitLossStatementMapper;
     @Resource
     private BalanceSheetManualMapper balanceSheetManualMapper;
@@ -1628,7 +1632,6 @@ public class DataImportService extends BaseService {
         return res;
     }
 
-
     /**
      * 25/02/2019 18:52
      *
@@ -1662,6 +1665,35 @@ public class DataImportService extends BaseService {
         return pageInfo;
     }
 
+    /**
+     * 25/02/2019 18:52
+     *
+     * [type]
+     * @author Gary J Li
+     * @return
+     *
+     */
+    public PageInfo<DataValidateLogDto> displayProcessLog(DataProcessParam param) {
+
+        DataValidateLogExample example = new DataValidateLogExample();
+
+        DataValidateLogExample.Criteria criteria =example.createCriteria();
+
+        Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
+
+        List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
+        // 这里会导致任何人都可以看到未映射到主体的数据
+        orgIds.add("");
+        criteria.andOrganizationIdIn(orgIds);
+        example.setOrderByClause("update_time desc");
+
+        PageInfo<DataValidateLogDto> pageInfo = new PageInfo<>(dataValidateLogMapper.selectByExample(example).stream()
+                .map(o -> beanUtil.copyProperties(o, new DataValidateLogDto())).collect(Collectors.toList()));
+        pageInfo.setTotal(page.getTotal());
+
+        return pageInfo;
+    }
+
     public OperationResultDto callExtractFinancialData(DataExtractParam dataExtractParam) {
         // todo 调用滴滴的http财务数据抽取调用接口 List<String> codes, Integer period, List<Integer> dataTypes
         OrganizationExample example = new OrganizationExample();

atms-dao/src/main/java/pwc/taxtech/atms/dao/DataValidateLogMapper.java

+package pwc.taxtech.atms.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entity.DataValidateLog;
+import pwc.taxtech.atms.entity.DataValidateLogExample;
+
+@Mapper
+public interface DataValidateLogMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    long countByExample(DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int insert(DataValidateLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int insertSelective(DataValidateLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    List<DataValidateLog> selectByExampleWithRowbounds(DataValidateLogExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    List<DataValidateLog> selectByExample(DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    DataValidateLog selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") DataValidateLog record, @Param("example") DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") DataValidateLog record, @Param("example") DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(DataValidateLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(DataValidateLog record);
+}
\ No newline at end of file

atms-web/src/main/webapp/app/common/vatservices/dataProcessService.js

@@ -80,9 +80,6 @@ webservices.factory('dataProcessService', ['$log', 'vatReportService', function
             _status = status;
             _cb = cb;
             setTimeout(heartBeat, timeInterval);
-        },
-        displayProcessLog: function (queryParams) {
-            return $http.post('/DataImport/displayProcessLog', queryParams, apiConfig.create());
         }
 
     };

atms-web/src/main/webapp/app/common/vatservices/vatImportService.js

@@ -402,6 +402,9 @@
 
         displayImportLog: function (pageInfo, type) {
             return $http.post('/DataImport/displayImportLog', {pageInfo: pageInfo, type: type}, apiConfig.create());
+        },
+        displayProcessLog: function (queryParams) {
+            return $http.post('/DataImport/displayProcessLog', queryParams, apiConfig.create());
         }
         /***************************************批量数据导入服务(真) end**************************************************************/
 

atms-web/src/main/webapp/app/dataImport/log/process-log/process-log.ctrl.js

@@ -63,49 +63,50 @@
                     allowHeaderFiltering: false,
                     caption: $translate.instant('id')
                 }, {
-                    dataField: "taxpayerIdNum",
+                    dataField: "companyCode",
                     width: '15%',
                     allowHeaderFiltering: false,
                     caption: $translate.instant('CompanyCode')
                 }, {
-                    dataField: "companyCode",
+                    dataField: "companyName",
                     allowHeaderFiltering: false,
                     caption: $translate.instant('CompanyName'),
-                    width: '15%'
+                    width: '14%'
                 }, {
-                    dataField: "companyName",
+                    dataField: "tmsPeriod",
                     allowHeaderFiltering: false,
-                    width: '10%',
-                    caption: $translate.instant('YearPeriod')
+                    width: '8%',
+                    caption: $translate.instant('TMSPeriod')
                 }, {
-                    dataField: "periodYear",
+                    dataField: "period",
                     allowHeaderFiltering: false,
-                    width: '5%',
+                    width: '8%',
                     caption: $translate.instant('Period')
                 }, {
-                    dataField: "periodMonth",
+                    dataField: "validateContent",
                     allowHeaderFiltering: false,
                     width: '15%',
                     caption: $translate.instant('ValidateContent')
                 }, {
-                    dataField: "periodMonth",
+                    dataField: "validateResult",
                     allowHeaderFiltering: false,
-                    width: '5%',
+                    width: '10%',
                     caption: $translate.instant('ValidateResult')
                 }, {
-                    dataField: "recordSize",
+                    dataField: "result",
                     allowHeaderFiltering: false,
                     width: '15%',
                     caption: $translate.instant('ResultMsg')
                 }, {
-                    dataField: "errorMsg",
+                    dataField: "validateUser",
                     allowHeaderFiltering: false,
                     width: '10%',
                     caption: $translate.instant('Operater')
                 }, {
-                    dataField: "errorMsg",
+                    dataField: "createTime",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    dataType : "date",
+                    width: '10%',
                     caption: $translate.instant('OperateTime')
                 }
                 ],
@@ -142,7 +143,7 @@
                     }
                 }
             };
-            // getProcessLog();
+            getProcessLog();
         };
 
         var getProcessLog = function () {