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

atms-api/src/main/java/pwc/taxtech/atms/common/CustomDateSerializer.java

@@ -10,13 +10,18 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+/**
+ * author kevin
+ * target ： Solve date conversion issues
+ * version 1.0
+ */
 public class CustomDateSerializer extends JsonSerializer<Date> {
 
     @Override
     public void serialize(Date value, JsonGenerator jgen, SerializerProvider arg2)
             throws IOException, JsonProcessingException {
         // TODO Auto-generated method stub
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String formattedDate = formatter.format(value);
         jgen.writeString(formattedDate);
 

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

@@ -92,4 +92,7 @@ public class BeanUtil {
         return new String(ch);
     }
 
+
+
+
 }

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

+package pwc.taxtech.atms.common.util;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Component;
+import pwc.taxtech.atms.entity.Organization;
+import pwc.taxtech.atms.entity.Project;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Map;
+
+/**
+ * author kevin
+ * version 1.0
+ * 封装一些简单的数据处理
+ */
+@Component
+public class DataUtil {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    //通过projectId查询project信息
+    public  Map<String, Object> getProjectById(String projectId){
+        return  jdbcTemplate.queryForMap("select * from project where id = ?", projectId);
+    }
+}

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

+package pwc.taxtech.atms.common.util;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.UUID;
+
+public class ResponseUtil {
+    private static HttpServletResponse response;
+    public  static ServletOutputStream response(HttpServletResponse response, String fileName, String type){
+        if(type != null){
+
+        }
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
+        response.setCharacterEncoding("UTF-8");
+        response.addHeader("Content-Disposition", "attachment;filename="
+                + UUID.randomUUID() + ".xls");
+        response.addHeader("x-file-name", fileName);
+        try {
+            return response.getOutputStream();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return  null;
+
+    }
+    public static ServletOutputStream response(HttpServletResponse response, String fileName){
+       return response(response, fileName, null );
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/Constant.java

@@ -127,4 +127,30 @@ public final class Constant {
 
     public static String DECIMAL_FORMAT = "#,##0.00";
     public static String ZERO_STR = "0";
+
+
+    public static class ReportDataValidateLog{
+
+          private String  segment3  = null;
+          private String segment5 = null;
+          private String segment6 = null;
+          private static boolean status  = true;
+          public  String  getResult(boolean status){
+
+              if(status){
+                  return  "校验结果失败: 科目代码: " + segment3 + "；利润中心:" +  segment5 + "; 产品编号: " + segment6;
+              }
+
+              return  "校验结果成功: 科目代码: " + segment3 + "；利润中心:" +  segment5 + "; 产品编号: " + segment6;
+          }
+
+        public  String  getResult(){
+            return  getResult(status);
+        }
+        public ReportDataValidateLog(String segment3, String segment5, String segment6){
+              this.segment3 = segment3;
+              this.segment5 = segment5;
+              this.segment6 = segment6;
+        }
+    }
 }
\ No newline at end of file

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

+package pwc.taxtech.atms.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import pwc.taxtech.atms.common.util.ResponseUtil;
+import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
+import pwc.taxtech.atms.dto.previewData.CitEAMAssetsDisposalDto;
+import pwc.taxtech.atms.dto.previewData.CitSalaryDataDto;
+import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
+import pwc.taxtech.atms.entity.CitEAMAssetsDisposal;
+import pwc.taxtech.atms.entity.CitSalaryAdvance;
+import pwc.taxtech.atms.service.impl.CitPreviewDataServiceImpl;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+
+@Controller
+@RequestMapping("api/v1/citPreviewDataController")
+public class CitPreviewDataController extends  BaseController {
+
+    @Autowired
+    private CitPreviewDataServiceImpl citPreviewDataService;
+
+    @RequestMapping("getSalaryAdvaceListData")
+    @ResponseBody
+    public CamelPagingResultDto<CitSalaryAdvance> getSalaryAdvaceListData(@RequestBody  CitSalaryDataDto citSalaryDataDto){
+        return   new CamelPagingResultDto<>(citPreviewDataService.getCitSalaryAdvanceDataList(citSalaryDataDto));
+    }
+
+    @RequestMapping("getCitPreviewEamDisposalDataList")
+    @ResponseBody
+    public CamelPagingResultDto<CitEAMAssetsDisposal> getCitPreviewEamDisposalDataList(@RequestBody CitEAMAssetsDisposalDto citSalaryDataDto){
+        return   new CamelPagingResultDto<>(citPreviewDataService.getCitPreviewEamDisposalDataList(citSalaryDataDto));
+    }
+
+    @RequestMapping(value = "exportDataEAM/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void exportDataEAM(@RequestBody CitEAMAssetsDisposal citEAMAssetsDisposal, HttpServletResponse response) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat( "yyyy-MM-dd hh:MM:ss");
+        String format = simpleDateFormat.format(new Date());
+        String fileName = "EAM资产处理金额记录表"+ format;
+        int count = citPreviewDataService.exportDataEAM(citEAMAssetsDisposal, ResponseUtil.response(response, fileName));
+
+        if (count == 0) {
+            response.setStatus(SC_NO_CONTENT);
+        } else {
+            response.setStatus(SC_OK);
+        }
+    }
+
+
+}

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

@@ -58,7 +58,7 @@ public class OperationLogController {
     public Boolean addOperationLog(VatOperationLog vatOperationLog) {
         OperationLogDto operationLogDto = new OperationLogDto();
         CommonUtils.copyProperties(vatOperationLog, operationLogDto);
-//        operationLogService.addOperationLog(operationLogDto);
+        operationLogService.addOperationLog(operationLogDto);
         return true;
     }
 }

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

 package pwc.taxtech.atms.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import pwc.taxtech.atms.common.util.DateUtils;
 import pwc.taxtech.atms.constant.enums.EnumServiceType;
 import pwc.taxtech.atms.dpo.ReportDto;
 import pwc.taxtech.atms.dto.FileDto;

atms-api/src/main/java/pwc/taxtech/atms/dto/FileDto.java

 package pwc.taxtech.atms.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.springframework.format.annotation.DateTimeFormat;
 import pwc.taxtech.atms.common.CustomDateSerializer;
 import pwc.taxtech.atms.entity.BaseEntity;
 

atms-api/src/main/java/pwc/taxtech/atms/dto/QueryOperateParamDto.java

@@ -17,6 +17,33 @@ public class QueryOperateParamDto {
     private Integer logType;
 
     private PagingDto pageInfo;
+    private String QueryValue;
+    private String Period;
+    private String ModuleID;
+
+    public String getQueryValue() {
+        return QueryValue;
+    }
+
+    public void setQueryValue(String queryValue) {
+        QueryValue = queryValue;
+    }
+
+    public String getPeriod() {
+        return Period;
+    }
+
+    public void setPeriod(String period) {
+        Period = period;
+    }
+
+    public String getModuleID() {
+        return ModuleID;
+    }
+
+    public void setModuleID(String moduleID) {
+        ModuleID = moduleID;
+    }
 
     public String getSearchText() {
         return searchText;

atms-api/src/main/java/pwc/taxtech/atms/dto/previewData/CitEAMAssetsDisposalDto.java

+package pwc.taxtech.atms.dto.previewData;
+
+import com.github.pagehelper.PageInfo;
+import pwc.taxtech.atms.dto.input.CamelPagingDto;
+
+public class CitEAMAssetsDisposalDto {
+    private CamelPagingDto pageInfo;
+
+    public CamelPagingDto getPageInfo() {
+        return this.pageInfo;
+    }
+
+    public void setPageInfo(CamelPagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/revenuconf/RevenueConfResult.java

@@ -17,6 +17,7 @@ public class RevenueConfResult extends RevenueConfig {
     }
 
     public String getRevenueTypeStr() {
+
         return RevenueConfEnum.RevenueType.MAPPING.get(this.getRevenueType());
     }
 

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

+package pwc.taxtech.atms.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper;
+import pwc.taxtech.atms.dao.CitSalaryAdvanceMapper;
+import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
+import pwc.taxtech.atms.dto.previewData.CitEAMAssetsDisposalDto;
+import pwc.taxtech.atms.dto.previewData.CitSalaryDataDto;
+import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
+import pwc.taxtech.atms.dto.vatdto.dd.BalanceSheetDto;
+import pwc.taxtech.atms.dto.vatdto.dd.TrialBalanceExportDto;
+import pwc.taxtech.atms.entity.CitEAMAssetsDisposal;
+import pwc.taxtech.atms.entity.CitEAMAssetsDisposalExample;
+import pwc.taxtech.atms.entity.CitSalaryAdvance;
+import pwc.taxtech.atms.entity.CitSalaryAdvanceExample;
+import pwc.taxtech.atms.thirdparty.ExcelUtil;
+import pwc.taxtech.atms.vat.dpo.TrialBalanceCondition;
+import pwc.taxtech.atms.vat.entity.TrialBalance;
+
+import javax.servlet.ServletOutputStream;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static pwc.taxtech.atms.common.util.SpringContextUtil.trialBalanceMapper;
+
+@Service
+public class CitPreviewDataServiceImpl extends  BaseService {
+
+    @Autowired
+    private CitSalaryAdvanceMapper citSalaryAdvanceMapper;
+
+    public PageInfo<CitSalaryAdvance> getCitSalaryAdvanceDataList(CitSalaryDataDto citSalaryDataDto ){
+        CitSalaryAdvanceExample example = new CitSalaryAdvanceExample();
+        CitSalaryAdvanceExample.Criteria criteria = example.createCriteria();
+        if(!"".equals(citSalaryDataDto.getPoSubjectName()) && citSalaryDataDto.getPoSubjectName() !=  null){//根据PO主体名称进行查询
+            criteria.andPoSubjectNameEqualTo(citSalaryDataDto.getPoSubjectName());
+        }
+        Page page = PageHelper.startPage(citSalaryDataDto.getPageInfo().getPageIndex(), citSalaryDataDto.getPageInfo().getPageSize());
+        List<CitSalaryAdvance> citSalaryAdvances = citSalaryAdvanceMapper.selectByExample(example);
+        PageInfo<CitSalaryAdvance> pageInfo =new PageInfo<CitSalaryAdvance>(citSalaryAdvances);
+        pageInfo.setTotal(page.getTotal());
+        return pageInfo;
+    }
+
+    @Autowired
+    private CitEAMAssetsDisposalMapper citEAMAssetsDisposalMapper;
+
+    public PageInfo<CitEAMAssetsDisposal> getCitPreviewEamDisposalDataList(CitEAMAssetsDisposalDto citEAMAssetsDisposalDto) {
+        CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample();
+        CitEAMAssetsDisposalExample.Criteria criteria = example.createCriteria();
+        Page page = PageHelper.startPage(citEAMAssetsDisposalDto.getPageInfo().getPageIndex(), citEAMAssetsDisposalDto.getPageInfo().getPageSize());
+        List<CitEAMAssetsDisposal> citSalaryAdvances = citEAMAssetsDisposalMapper.selectByExample(example);
+        PageInfo<CitEAMAssetsDisposal> pageInfo =new PageInfo<CitEAMAssetsDisposal>(citSalaryAdvances);
+        pageInfo.setTotal(page.getTotal());
+        return  pageInfo;
+    }
+
+    private Map<String, String> generalEAMHeader() {
+        Map<String, String> header = new LinkedHashMap<>();
+        header.put("Date","数据日期");
+        header.put("Source","来源");
+        header.put("Period","期间");
+        header.put("LedgerId","账套ID");
+        header.put("OccurPeriod","发生期间");
+        header.put("AssetLabelNumber","资产标签号");
+        header.put("CompensationSaleAmount","赔偿/变卖金额");
+        header.put("CreatedBy","主体性质");
+        return header;
+    }
+    public int exportDataEAM(CitEAMAssetsDisposal citEAMAssetsDisposal, ServletOutputStream response) {
+        try {
+            CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample();
+            List<CitEAMAssetsDisposal> list = citEAMAssetsDisposalMapper.selectByCondition(citEAMAssetsDisposal);
+            Map<String, String> header = generalEAMHeader();
+/*
+            TrialBalanceCondition condition = new TrialBalanceCondition();
+            beanUtil.copyProperties(param, condition);
+            List<TrialBalance> trialBalances = trialBalanceMapper.selectByCondition(condition);*/
+/*
+            Map<String, String> header = generalTBHeader();
+            List<TrialBalanceExportDto> cellList = new ArrayList<>();
+            trialBalances.forEach(tb -> {
+                TrialBalanceExportDto d = new TrialBalanceExportDto();
+                d = beanUtil.copyProperties(tb, d);
+                cellList.add(d);
+            });*/
+            ExcelUtil.exportExcel(header, list, response);
+            return list.size();
+        } catch (Exception e) {
+            logger.error("EAM资产处理金额记录表: %s", e.getMessage());
+            return 0;
+        }
+    }
+}

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

@@ -12,7 +12,6 @@ import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import pwc.taxtech.atms.common.config.SystemConfig;
 import pwc.taxtech.atms.common.message.ErrorMessage;
 import pwc.taxtech.atms.common.message.ErrorMessageCN;
 import pwc.taxtech.atms.common.util.DateUtils;

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

@@ -104,7 +104,7 @@ public class OperationLogServiceImpl extends AbstractService {
     public PagingResultDto<OperationLogDto> getOperationLogList(QueryOperateParamDto queryOperateParamDto) {
         logger.debug("OperationLogService getOperationLogList");
         // validate
-        Assert.hasText(queryOperateParamDto.getModuleName(), "Empty moduleName");
+       // Assert.hasText(queryOperateParamDto.getModuleName(), "Empty moduleName");
 
         final PagingDto pageInfo = queryOperateParamDto.getPageInfo();
 

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

@@ -14,13 +14,12 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartFile;
 import pwc.taxtech.atms.common.CommonUtils;
-import pwc.taxtech.atms.common.util.DateUtils;
-import pwc.taxtech.atms.common.util.FileUploadUtil;
-import pwc.taxtech.atms.common.util.MyAsserts;
-import pwc.taxtech.atms.common.util.SpringContextUtil;
+import pwc.taxtech.atms.common.util.*;
 import pwc.taxtech.atms.constant.Constant;
 import pwc.taxtech.atms.constant.enums.*;
 import pwc.taxtech.atms.dao.*;
@@ -37,10 +36,12 @@ import pwc.taxtech.atms.service.impl.BaseService;
 import pwc.taxtech.atms.service.impl.CellConfigTranslater;
 import pwc.taxtech.atms.service.impl.DistributedIdService;
 import pwc.taxtech.atms.vat.dao.*;
+import pwc.taxtech.atms.vat.dao.DataValidateLogMapper;
 import pwc.taxtech.atms.vat.dpo.DataSourceCellDataDto;
 import pwc.taxtech.atms.vat.dpo.DataSourceExtendDto;
 import pwc.taxtech.atms.vat.dpo.InputVATInvoiceItemExtendDto;
 import pwc.taxtech.atms.vat.entity.*;
+import pwc.taxtech.atms.vat.entity.DataValidateLog;
 import pwc.taxtech.atms.vat.service.impl.report.functions.FormulaHelper;
 
 import java.io.File;
@@ -553,7 +554,6 @@ public class ReportServiceImpl extends BaseService {
     private JournalEntryMapper journalEntryMapper;
   /*  @Autowired
     private CitJour*/
-
     //数据校验
     private void DataValidation(Integer periodParam, String projectId, PeriodJob genJob) {
         setStatus(genJob,"DA004", STATUS_BEGIN);
@@ -590,20 +590,62 @@ public class ReportServiceImpl extends BaseService {
         }else{
             map2.put("period", "" + periodParam);
         }
+        Map<String, Object> map = new HashMap<>();
+        map.put("period", periodParam);
+        map.put("projectId", projectId);
+        Map<String, Object> mapProject = new DataUtil().getProjectById(projectId);
+        map.put("companyCode", mapProject.get("code"));
+        map.put("companyName", mapProject.get("name"));
         List<JournalEntry> journalEntries = journalEntryMapper.selectNowAdjustData(map2);
         for(int i =0; i< adjustmentTables.size(); i++){
                 for(int j =0; j< journalEntries.size(); j++){
-                    if(journalEntries.get(j).getSegment3().equals(adjustmentTables.get(j).getSegment3()) &&
-                            journalEntries.get(j).getSegment5().equals(adjustmentTables.get(j).getSegment5())&&
-                            journalEntries.get(j).getSegment6().equals(adjustmentTables.get(j).getSegment6())  && journalEntries.get(j).getPeriodJrMinDr() != adjustmentTables.get(j).getPeriodDrMixCr()  ){
+                    JournalEntry journalEntry = journalEntries.get(j);
+                    AdjustmentTable adjustmentTable = adjustmentTables.get(j);
+                    if(journalEntry.getSegment3().equals(adjustmentTable.getSegment3()) &&
+                            journalEntry.getSegment5().equals(adjustmentTable.getSegment5())&&
+                            journalEntry.getSegment6().equals(adjustmentTable.getSegment6())  && journalEntry.getPeriodJrMinDr() != adjustmentTable.getPeriodDrMixCr()  ){
                                 setStatus(genJob,STATUS_ERROR );
+                        Constant.ReportDataValidateLog reportDataValidateLog = new Constant.ReportDataValidateLog(journalEntries.get(j).getSegment3(), journalEntries.get(j).getSegment5(), journalEntries.get(j).getSegment6());
+                        //记录校验结果
+                        //
+
+                        map.put("result", reportDataValidateLog.getResult(false));
+                        map.put("validateResult", "error");
+                        map.put("tmsPeriod", journalEntry.getTmsPeriod());
+                        map.put("organizationId", journalEntry.getOrganizationId());
+
+                            insertDataValidateResult(map);
+                        periodJobMapper.updateByPrimaryKey(genJob);
+                        return;
                     }
                 }
         }
         setStatus(genJob, STATUS_END);
+        map.put("validateResult", "success");
+        map.put("result", "");
+        map.put("tmsPeriod", journalEntries.get(0).getTmsPeriod());
+        map.put("organizationId", journalEntries.get(0).getOrganizationId());
+        insertDataValidateResult(map);
         periodJobMapper.updateByPrimaryKey(genJob);
     }
 
+    @Autowired
+    private DataValidateLogMapper dataValidateLogMapper;
+
+    public void insertDataValidateResult(Map map){
+        DataValidateLog dataValidateLog = new DataValidateLog();
+        dataValidateLog.setCreateTime(new Date());
+        dataValidateLog.setPeriod((Integer) map.get("period"));
+        dataValidateLog.setProjectId((String)map.get("projectId"));
+        dataValidateLog.setValidateResult((String)map.get("validateResult"));
+        dataValidateLog.setResult((String)map.get("result"));
+        dataValidateLog.setOrganizationId((String)map.get("organizationId"));
+        dataValidateLog.setCompanyCode((String)map.get("companyCode"));
+        dataValidateLog.setCompanyName((String)map.get("companyName"));
+        dataValidateLog.setTmsPeriod((Integer) map.get("tmsPeriod"));
+        dataValidateLogMapper.insert(dataValidateLog);
+    }
+
 
     public List<CellTemplateReferenceDto> getTemplateReferences(int period) {
         return new ArrayList<>();

atms-api/src/main/resources/conf/conf_profile_pub.properties

-jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL = TCP)(HOST = 10.0.1.224)(PORT = 1521))(ADDRESS = (PROTOCOL = TCP)(HOST = 10.0.1.225)(PORT = 1521))(CONNECT_DATA =(SERVER = DEDICATED)(SERVICE_NAME = taxdb)))
-jdbc_user=tax_admin
-jdbc_password=taxadmin2018
+jdbc_url=jdbc:mysql://172.20.2.218:3300/fintax_test?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+jdbc_user=fintax_user_test
+jdbc_password=Fintaxuser@123Test
 #jdbc_password=111111
-jdbc_admin_db=tax_admin
+jdbc_admin_db=taxadmin2018
 
 jdbc2_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL = TCP)(HOST = 10.0.1.224)(PORT = 1521))(ADDRESS = (PROTOCOL = TCP)(HOST = 10.0.1.225)(PORT = 1521))(CONNECT_DATA =(SERVER = DEDICATED)(SERVICE_NAME = taxdb)))
 jdbc2_user=pwc_invoice
@@ -15,7 +15,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
 mail_jdbc_user=sa
 mail_jdbc_password=atmsunittestSQL
 
-web.url=http://dts.erp.didichuxing.com:8080
+web.url=http://172.20.201.164:9001
 #web.url=*
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
@@ -23,7 +23,7 @@ jwt.expireSecond=180000
 jwt.refreshSecond=600
 
 #File Server Config
-file.server.url=http://etms.longi-silicon.com:9111
+file.server.url=http://172.20.201.164:9001
 file.server.upload=/api/v1/upload
 
 #upload
@@ -33,7 +33,7 @@ max_file_length=104857600
 distributed_id_datacenter=10
 distributed_id_machine=15
 
-api.url=http://dts.erp.didichuxing.com:8180
+api.url=http://172.20.201.164:8180
 
 # Longi config
 longi_api_basic_user=

atms-dao/etc/generator-mysql/vatGeneratorConfig.xml

@@ -46,7 +46,7 @@
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>-->
 
-        <table tableName="bill_detail" domainObjectName="BillDetail">
+        <table tableName="data_validate_log" domainObjectName="DataValidateLog">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>

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

@@ -107,4 +107,6 @@ public interface CitEAMAssetsDisposalMapper extends MyMapper {
     int updateByPrimaryKey(CitEAMAssetsDisposal record);
 
     int insertBatch(List<CitEAMAssetsDisposal> citEAMAssetsDisposalList);
+
+    List<CitEAMAssetsDisposal> selectByCondition(@Param("citEAMAssetsDisposal") CitEAMAssetsDisposal citEAMAssetsDisposal);
 }
\ No newline at end of file

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-dao/src/main/java/pwc/taxtech/atms/entity/CitEAMAssetsDisposal.java

 package pwc.taxtech.atms.entity;
 
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -400,6 +403,7 @@ public class CitEAMAssetsDisposal extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
+    @JsonSerialize(using = CustomDateSerializer.class)
     public Date getCreateTime() {
         return createTime;
     }
@@ -424,6 +428,7 @@ public class CitEAMAssetsDisposal extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
+    @JsonSerialize(using = CustomDateSerializer.class)
     public Date getUpdateTime() {
         return updateTime;
     }

atms-dao/src/main/java/pwc/taxtech/atms/entity/CitSalaryAdvance.java

 package pwc.taxtech.atms.entity;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -470,6 +472,8 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
+    @JsonSerialize(using = CustomDateSerializer.class)
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -494,6 +498,7 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
+    @JsonSerialize(using = CustomDateSerializer.class)
     public Date getUpdateTime() {
         return updateTime;
     }

atms-dao/src/main/java/pwc/taxtech/atms/entity/CustomDateSerializer.java

+package pwc.taxtech.atms.entity;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class CustomDateSerializer extends JsonSerializer<Date> {
+
+    @Override
+    public void serialize(Date value, JsonGenerator jgen, SerializerProvider arg2)
+            throws IOException, JsonProcessingException {
+        // TODO Auto-generated method stub
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String formattedDate = formatter.format(value);
+        jgen.writeString(formattedDate);
+
+    }
+
+}
\ No newline at end of file

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper">
-
+  <sql id="QueryCondition">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.orgId)">
+      AND period= #{citEAMAssetsDisposal.period,jdbcType=VARCHAR}
+    </if>
+    <if test="citEAMAssetsDisposal.periodStart!=null">
+      AND compensation_sale_amount &gt;= #{citEAMAssetsDisposal.compensationSaleAmount,jdbcType=INTEGER}
+    </if>
+    <if test="citEAMAssetsDisposal.periodEnd!=null">
+      AND asset_label_number &lt;= #{citEAMAssetsDisposal.assetLabelNumber,jdbcType=INTEGER}
+    </if>
+  </sql>
   <insert id="insertBatch" parameterType="java.util.List">
     insert into cit_eam_assets_disposal
     (<include refid="Base_Column_List"/>)
@@ -61,4 +72,10 @@
     SELECT 1 FROM DUAL;
   </insert>
 
+  <select id ="selectByCondition" parameterType="pwc.taxtech.atms.entity.CitEAMAssetsDisposal">
+      select * from cit_eam_assets_disposal
+    WHERE
+    <include refid="QueryCondition"/>
+  </select>
+
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="pwc.taxtech.atms.vat.dao.DataValidateLogMapper">
+
+</mapper>
\ No newline at end of file

atms-web/src/main/resources/conf.properties

-api.url=${api.url}
+   api.url=${api.url}
 
 cookie.maxAgeSeconds=${cookie.maxAgeSeconds}
 

atms-web/src/main/resources/conf_profile_pub.properties

-api.url=http://dts.erp.didichuxing.com:8180/
+api.url=http://172.20.201.164:8180/
 
 cookie.maxAgeSeconds=86400
 

atms-web/src/main/webapp/Scripts/login.js

@@ -250,14 +250,13 @@
 
     //uses to remove expired localstorage cache after login successfully
     var removeExpiredLocalCache = function (data, returnUrl) {
-
         $.ajax({
             type: 'GET',
-            url: data.ApiHost + '/api/v1/cache/getallcache',
+            url: data.ApiHost + '/api/v1/cache/' +
+            'getallcache',
             data: {},
             contentType: "application/json; charset=utf-8",
             success: function (cachelist) {
-
                 cachelist.push({
                     cacheKey: '/api/v1/user/getUserPermission',
                     cacheTime: '11',

atms-web/src/main/webapp/Scripts/module-part2.js

@@ -847,7 +847,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
                                 appTranslation.load([appTranslation.cit]);
                             }
                         ],
-                        template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
+                        template: '<cit-preview-salary-advance-list></cit-preview-salary-advance-list>'
                     }
                 },
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
@@ -866,7 +866,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
                                 appTranslation.load([appTranslation.cit]);
                             }
                         ],
-                        template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
+                        template: '<cit-preview-eam-disposal-list></cit-preview-eam-disposal-list>'
                     }
                 },
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),

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

@@ -1117,6 +1117,18 @@
     "bsGenerateVer": "试算平衡生成版",
     "bsMappingVer": "试算平衡Mapping版",
     "salaryAdvance": "预提重分类",
-    "eamDisposal": "EAM资产处置金额记录表"
+    "eamDisposal": "EAM资产处置金额记录表",
+    "organizationId" : "机构编号",
+    "source" : "来源",
+    "poSubjectName" : "PO主体名称",
+    "advancePrice" : "预提金额",
+    "approvedPrice": "已批准标准发票金额",
+    "createBy": "创建人",
+    "createTime" : "创建时间",
+    "citSalaryAdvance" : "预提重分类数据源",
+    "assetLabelNumber" : "资产标签号",
+    "compensationSaleAmount" : "赔偿/变卖金额",
+    "EAMDisposal" : "EAM资产处理金额"
+
 
   }
\ No newline at end of file

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js

@@ -65,7 +65,7 @@
          
             //初始化列数据
             var initColumns = function () {
-                debugger;
+                
                 //初始化进项发票汇总表列名
                 $scope.incomeInvoiceTotalColumns = [
                     $translate.instant('PleaseSelectColumn'),
@@ -142,14 +142,14 @@
             //上传文件
             var uploadfile = function (file) {
                 var url = uploadUrl;
-                debugger;
+                
                 if (file) {
-                    debugger;
+                    
                     successCount = 0;
                     if (!file.$error) {
                         var tempFileName = PWC.newGuid() + '.dat';
                         var token = $('input[name="__RequestVerificationToken"]').val();
-                        debugger;
+                        
                         Upload.upload({
                             url: uploadUrl,
                             data: {
@@ -175,7 +175,7 @@
 
             //上传成功
             var uploadSuccess = function (resp) {
-                debugger;
+                
                 successCount++;
                 if (successCount === 1) {
                     $scope.tempFileName = resp.data;
@@ -455,7 +455,7 @@
 
             //简易导入,importType来分辨是覆盖导入还是追加导入
             $scope.importDataNew = function(importType){
-                debugger;
+                
                 var a =  projectId;
                 if (!$scope.file || !$scope.file.name) {
 
@@ -483,7 +483,7 @@
                         withCredentials: true
                     }, withCredentials: true
                 }).then(function(resp){
-                    debugger;
+                    
                     assetListService.getAssetGroupResultData(projectId).success(function (groupResultData) {
                         $scope.assetGroupResultDataSource = groupResultData.data;
                     });
@@ -639,6 +639,7 @@
                 $scope.ImportTotalYearDifferenceAmount = 0
 
                 assetListService.getAssetListData().success(function (rsp) {
+                    
                     if (rsp && rsp.length > 0) {
                         $scope.isShowImportTotalBtn = false;
                         initPagingControl(rsp.length);
@@ -673,14 +674,14 @@
 
             //根据分类获取数据
             function getAssetResultList(assetType) {
-                debugger;
+                
                 $scope.TotalCount = 0;
                 $scope.TotalAccountAcquisitionValue = 0;
                 $scope.TotalAccountYearDepreciationAmount = 0;
                 $scope.TotalTaxCurrentYearDepreciationAmount = 0;
                 $scope.TotalYearDifferenceAmount = 0
                 assetListService.getAssetResultList(assetType,projectId,taxAccountCompare).success(function (assetListData) {
-                    debugger;
+                    
                     var data = assetListData.data;
                     if (data) {
                         var index = 1;
@@ -730,7 +731,6 @@
 
             //初始化dx控件
             function initDxGrid() {
-                debugger;
                 var dupColumns = [
                         { caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50 },
                         { caption: $translate.instant('AssetNumber'), dataField: "assetNumber" },
@@ -816,7 +816,7 @@
                                     }],
                                     setCellValue: function (rowData, value) {
                                         rowData.assetGroupId = value;
-                                        debugger;
+                                        
                                         var aseetDetailList = _.filter($scope.detailGroupListDataSource, function (item) {
                                             return item.assetGroupId == value;
                                         });
@@ -843,7 +843,7 @@
                                     }],
                                     setCellValue: function (rowData, value) {
                                         rowData.assetDetailGroupId = value;
-                                        debugger;
+                                        
                                         var aseetDetailList = _.filter($scope.detailGroupListDataSource, function (item) {
                                             return item.id == value;
                                             return item.id == value;
@@ -854,7 +854,7 @@
                                     },
                                     lookup: {
                                         dataSource: function (options) {
-                                            debugger;
+                                            
                                             return {
                                                 store: $scope.detailGroupListDataSource,
                                                 filter: options.data ? ["assetGroupId", "=", options.data.assetGroupId] : null
@@ -887,7 +887,7 @@
 
             //初始化dx控件
             function initAssetResultDxGrid() {
-                debugger;
+                
                 var dupColumns = [
                         { caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
                         { caption: $translate.instant('AssetNumber'), dataField: "assetNumber", width: 120, allowEditing: false, fixed: true },
@@ -948,7 +948,7 @@
                     },
                     onCellPrepared: function (e) {
                         if (e.rowType === "header") {
-                            debugger;
+                            
                             if (e.column.caption === $translate.instant('ImportErrorPopUpNoCol') ||
                                 e.column.caption === $translate.instant('AssetNumber') ||
                                 e.column.caption === $translate.instant('AssetGroupName') ||
@@ -1048,7 +1048,7 @@
                 valueExpr: "key",
                 displayExpr: "name",
                 onValueChanged: function(data) {
-                    debugger;
+                    
                     taxAccountCompare = data.value;
                     getAssetResultList($scope.displayType - 1);
                 }
@@ -1056,10 +1056,10 @@
 
             //获取数据服务
             var getGroupList = function () {
-                debugger;
+                
                 var deferred = $q.defer();
                 assetListService.getAssetGroupListData().success(function (data) {
-                    debugger;
+                    
                     if (data.data) {
                         $scope.groupListDataSource = data.data;
                         deferred.resolve(data.data);
@@ -1073,10 +1073,10 @@
 
             //获取导入后数据
             var getGroupDetailList = function () {
-                debugger;
+                
                 var deferred = $q.defer();
                 assetListService.getAssetDetailGroupListData().success(function (data) {
-                    debugger;
+                    
                     if (data.data) {
                         $scope.detailGroupListDataSource = data.data;
                         deferred.resolve(data.data);
@@ -1298,13 +1298,13 @@
 
             //保存分类信息
             $scope.saveAssetGroupInfo = function () {
-                debugger;
+                
                 var dataGrid = $('#assetsGroupGrid').dxDataGrid("instance");
                 dataGrid.saveEditData();
                 if (validationAssetGroupList())
                 {
                     assetListService.saveAssetGroupInfo($scope.assetGroupResultDataSource, $scope.saveGroupType, projectId).success(function (data) {
-                        debugger;
+                        
                         if (data) {
                             SweetAlert.success($translate.instant('SaveSuccess'));
                             if ($scope.modalInstance) {
@@ -1377,13 +1377,13 @@
 
             //控制明细信息中删除权限
             var getUserPermission = function () {
-                debugger;
+                
                 var list = [];
                 $scope.editCode = constant.citPermission.dataImport.assetList.importCode;
                 list.push($scope.editCode);
                 $scope.hasEditPermission = false;
                 $scope.$root.checkUserOrganizationPermissionList(list).success(function (data) {
-                    debugger;
+                    
                     $scope.hasEditPermission = data[$scope.editCode];                    
                     //$scope.dataGridInstance.option("editing.allowUpdating", $scope.hasEditPermission);
                     //$scope.dataGridInstance.refresh();

atms-web/src/main/webapp/app/cit/preview/cit-preview-asset-list/cit-preview-asset-list.js

+citModule.directive('citPreviewAssetList', ['$log', '$translate',
+    function ($log, $translate) {
+        'use strict';
+        $log.debug('citPreviewAssetList.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/cit/preview/cit-preview-asset-list/cit-preview-asset-list.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'CitPreviewAssetListController',
+            link: function (scope, element) { 
+            }
+        };
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.ctrl.js

+citModule.controller('citPreviewEamDisposalController', ['$scope', '$log', '$translate', '$timeout', '$compile', '$uibModal', 'apiInterceptor',
+     'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatSessionService', 'citSessionService', 'vatImportService', 'loginContext',
+    'browserService', 'enums', 'vatOperationLogService', 'citPreviewDataService', 'vatCommonService', 'ackMessageBox','commonWebService',
+    function ($scope, $log, $translate, $timeout, $compile, $uibModal, apiInterceptor, SweetAlert, $q, uiGridConstants,
+              $interval, vatSessionService, citSessionService, vatImportService, loginContext, browserService, enums, vatOperationLogService, citPreviewDataService,
+              vatCommonService, ackMessageBox, commonWebService) {
+        'use strict';
+        $scope.listData = [];
+
+ /*       $scope.formOptions = {
+            formData: salaryData,
+            colCount: 2,
+            items: [{
+                dataField: "FirstName",
+                editorOptions: {
+                    value: ""
+                }
+            },
+                {
+                    itemType: "button",
+                    horizontalAlignment: "left",
+                    buttonOptions: {
+                        text: "查询",
+                        type: "success",
+                        useSubmitBehavior: true
+                    }
+                }]
+        };*/
+
+       /* $scope.onFormSubmit = function(e) {//执行查询
+
+            e.preventDefault();
+        };*/
+
+        //初始化dx控件
+        function initAssetResultDxGrid() {
+            var dupColumns = [
+                { caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
+                { caption: $translate.instant('period'), dataField: "period", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('source'), dataField: "source", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('assetLabelNumber'), dataField: "assetLabelNumber", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('compensationSaleAmount'), dataField: "compensationSaleAmount", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('createdBy'), dataField: "createBy", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('createTime'), dataField: "createTime", width: 200, allowEditing: false, fixed: true }
+            ];
+
+            $scope.assetsResultGridOptions = {
+                columns: dupColumns,
+                bindingOptions: {
+                    "dataSource": "listData",
+                },
+                editing: {
+                    mode: "batch",
+                    allowUpdating:true,
+                },
+                onInitialized: function (e) {
+                    $scope.dataGridInstance = e.component;
+                },
+                onCellPrepared: function (e) {
+
+                },
+                loadPanel: {
+                    enabled: true
+                },
+                paging: {
+                    pageSize: 100,
+                },
+                searchPanel: {
+                    visible: true,
+                    width: 240,
+                    placeholder: $translate.instant('SearchPlaceholder')
+                },
+                showBorders: true,
+                hoverStateEnabled: true,
+                //scrolling: { mode: "virtual" },
+                noDataText: $translate.instant('AccountVoucher_DataGrid_NoDataText'),
+                height: '99%',
+                width: '98%',
+                filterRow: {
+                    visible: true
+                },
+                onRowUpdating: function (e) {
+
+                },
+                onToolbarPreparing: function (e) {
+
+                }
+            }
+        }
+
+        //导出数据
+        $scope.downloadTB = function () {
+            citPreviewDataService.exportData($scope.queryParams).success(function (data, status, headers) {
+                if(status===204){
+                    SweetAlert.warning("没有数据可以下载");
+                    return;
+                }
+                vatExportService.exportToExcel(data, status, headers, 'EAM资产处置金额记录表.xls');
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        }
+        
+        
+        $scope.doDataReset = function () {
+            $scope.queryParams.period = "";
+            $scope.queryParams.compensationSaleAmount = "";
+            $scope.queryParams.assetLabelNumber = "";
+        }
+        $scope.doSearch = function () {
+            refreshConfigGrid();
+        }
+
+        var initListData = function(){
+            citPreviewDataService.getCitPreviewEamDisposalDataList($scope.queryParams).success(function (res) {
+                $scope.listData = commonWebService._index(res.list);
+                $scope.pagingOptions.totalItems = res.pageInfo.totalCount;
+                //$scope.$apply();
+            }).error(function (error) {
+                swal({
+                    title: "信息",
+                    text: error,
+                    type: "info"
+                });
+            });
+        }
+
+        //刷新页面
+        $scope.refreshConfigGrid = function () {
+            citPreviewDataService.getCitPreviewEamDisposalDataList($scope.queryParams)
+                .success(function (res) {
+                    if (res && res.list) {
+                        $scope.listData =commonWebService._index(res.list);
+                        $scope.pagingOptions.totalItems = res.pageInfo.totalCount;
+                    }else {
+                        SweetAlert.error($translate.instant('SystemError'));
+                    }
+                })
+        };
+
+        //开始
+        (function initialize() {
+
+            $('#input-invoice-period-picker').focus(function () {
+                $('.filter-button').popover("hide");
+            });
+            //初始化month-picker
+            $('#input-invoice-period-picker').rangePicker({
+                minDate: minDate,
+                maxDate: maxDate,
+                setDate: setDate,
+                months: $scope.monthList,//['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+                ConfirmBtnText: $translate.instant('Confirm'),
+                CancelBtnText: $translate.instant('ButtonCancel')
+            })
+
+            $scope.queryParams = {};
+            //分页的设置
+            $scope.queryParams.pagingOptions = {
+                pageIndex: 1,  //当前页码
+                totalItems: 0,  //总数据
+                pageSize: 20,  //每页多少条数据
+            };
+            initAssetResultDxGrid();
+            initListData();
+            if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
+                $('.periodInput')[0].style.left = "280px";
+            }else{
+                $('.periodInput')[0].style.left = "150px";
+            }
+        })();
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.js

+citModule.directive('citPreviewEamDisposalList', ['$log', '$translate',
+    function ($log, $translate) {
+        'use strict';
+        $log.debug('citPreviewSalaryAdvanceList.load...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'citPreviewEamDisposalController',
+            link: function (scope, element) { 
+            }
+        };
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js

@@ -291,7 +291,6 @@
         }
 
        function doStartCaculate2(isMergeManualDataSource) {
-
              vatReportService.generateAll(vatSessionService.project.id, isMergeManualDataSource, vatSessionService.month, vatSessionService.logUser.id ? vatSessionService.logUser.id : "").success(function (data) {
                  $scope.readonly = true;
                  if(data && data.result)