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

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

@@ -215,9 +215,32 @@ public class EbsApiController {
         }
     }
 
+    /**
+     * callback服务
+     * @param callBackDto
+     * @return
+     */
+    @RequestMapping(value = "/callback", method = RequestMethod.POST)
+    public ApiResultDto callback(@RequestBody EbsCallBackDto callBackDto) {
+        logger.info("EBS callback 调用,taskId ：{}",callBackDto.getTaskId());
+        ApiResultDto apiResultDto = new ApiResultDto();
+        try{
+            ebsApiService.changeCallBackStatus(callBackDto);
+            logger.debug("ebs callback taskId：{}，status:{} end ",callBackDto.getTaskId(),callBackDto.getTaskStatus());
+            setApiResult(apiResultDto,EnumErrorCodeMsg.SUCCESS);
+            return apiResultDto;
+        }catch(Exception e){
+            logger.error("ebs callback error.", e);
+            setApiResult(apiResultDto,EnumErrorCodeMsg.APIERROR);
+            return apiResultDto;
+        }
+    }
+
     private void setApiResult(ApiResultDto apiResultDto,EnumErrorCodeMsg error) {
         apiResultDto.setCode(error.getCode());
         apiResultDto.setMessage(error.getMsg());
     }
 
+
+
 }

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

@@ -25,10 +25,9 @@ import pwc.taxtech.atms.service.impl.TaxDocumentServiceImpl;
 import pwc.taxtech.atms.thirdparty.ExcelUtil;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
@@ -166,12 +165,30 @@ public class TaxDocumentController {
      */
     @PostMapping("/previewExcelToJson")
     @ResponseBody
-    public String previewExcel(String path) {
-
+    public String previewExcel(@RequestParam("path") String path) {
         try {
             JSONArray dataArray = new JSONArray();
+            URL httpurl=new URL(path);
+            InputStream is;
+            HttpURLConnection httpConn=(HttpURLConnection)httpurl.openConnection();
+            httpConn.setDoOutput(true);// 使用 URL 连接进行输出
+            httpConn.setDoInput(true);// 使用 URL 连接进行输入
+            httpConn.setUseCaches(false);// 忽略缓存
+            httpConn.setRequestMethod("GET");// 设置URL请求方法
+            //可设置请求头
+            httpConn.setRequestProperty("Content-Type", "application/octet-stream");
+            httpConn.setRequestProperty("Connection", "Keep-Alive");// 维持长连接
+            httpConn.setRequestProperty("Charset", "UTF-8");
+            httpConn.connect();
+            if (httpConn.getResponseCode() >= 400 ) {
+                is = httpConn.getErrorStream();
+            }
+            else{
+                is = httpConn.getInputStream();
+            }
+            InputStream inStream =is;
 
-            XSSFWorkbook xssfWorkbook = new XSSFWorkbook(new FileInputStream(path));
+            XSSFWorkbook xssfWorkbook = new XSSFWorkbook(inStream);
             // 循环工作表Sheet
             for (int numSheet = 0; numSheet < xssfWorkbook.getNumberOfSheets(); numSheet++) {
                 XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(numSheet);
@@ -223,7 +240,7 @@ public class TaxDocumentController {
                 dataArray.add(sheetJson);
             }
             return dataArray.toString();
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return JSONNull.getInstance().toString();
         }

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

@@ -15,7 +15,7 @@ public class TaxDocumentDto {
 
     private String fileAttr;//档案属性
 
-    private Integer fileTypeId;//文件类型的id
+    private Long fileTypeId;//文件类型的id
 
     private String fileType;//档案类型
 
@@ -165,11 +165,11 @@ public class TaxDocumentDto {
         this.fileAttr = fileAttr;
     }
 
-    public Integer getFileTypeId() {
+    public Long getFileTypeId() {
         return fileTypeId;
     }
 
-    public void setFileTypeId(Integer fileTypeId) {
+    public void setFileTypeId(Long fileTypeId) {
         this.fileTypeId = fileTypeId;
     }
 

atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/EbsCallBackDto.java

+package pwc.taxtech.atms.dto.ebsdto;
+
+public class EbsCallBackDto {
+    private Long taskId;
+    private String taskStatus;
+    private String taskDesc;
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(String taskStatus) {
+        this.taskStatus = taskStatus;
+    }
+
+    public String getTaskDesc() {
+        return taskDesc;
+    }
+
+    public void setTaskDesc(String taskDesc) {
+        this.taskDesc = taskDesc;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/service/EbsApiService.java

@@ -68,4 +68,10 @@ public interface EbsApiService {
      * @param items
      */
     void queryRemoteServerThenUpdateOrg(Long id, List<OrganizationQueryDto> items);
+
+    /**
+     * ebs最后调用更新状态
+     * @param ebsCallBackDto
+     */
+    void changeCallBackStatus(EbsCallBackDto ebsCallBackDto);
 }

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

@@ -82,7 +82,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         logger.debug("requestJEItems 日记账表条目：" + JSON.toJSONString(items));
         for (JournalEntryQueryDto a : items) {
             try {
-                processJE(a);
+                processJE(id,a);
             } catch (Exception e) {
                 logger.error("break loop as catch:" + e, e);
             }
@@ -238,8 +238,9 @@ public class EbsApiServiceImpl implements EbsApiService {
         logger.debug("end queryRemoteServerThenUpdateOAR 汇率表,took [{}] ms", System.currentTimeMillis() - start);
     }
 
-    private void processJE(JournalEntryQueryDto item) {
+    private void processJE(Long id,JournalEntryQueryDto item) {
         JournalEntryExample journalEntryExample = new JournalEntryExample();
+        item.setTaskId(String.valueOf(id));
         //日记账头ID和日记账行号
         journalEntryExample.createCriteria().andHeaderIdEqualTo(item.getHeaderId()).andLineNumEqualTo(item.getLineNum()).andTaskIdNotEqualTo(item.getTaskId());
         List<JournalEntry> journalEntryList = journalEntryMapper.selectByExample(journalEntryExample);
@@ -264,6 +265,7 @@ public class EbsApiServiceImpl implements EbsApiService {
 
     private void processTB(Long id,TrialBalanceQueryDto item) {
         TrialBalanceExample example = new TrialBalanceExample();
+        item.setTaskId(String.valueOf(id));
         //机构编码和期间
         example.createCriteria().andSegment1EqualTo(item.getSegment1()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdNotEqualTo(item.getTaskId());
         List<TrialBalance> itemList = trialBalanceMapper.selectByExample(example);
@@ -283,6 +285,7 @@ public class EbsApiServiceImpl implements EbsApiService {
 
     private void processCF(Long id,CashFlowQueryDto item) {
         CashFlowExample example = new CashFlowExample();
+        item.setTaskId(String.valueOf(id));
         //机构编码和期间
         example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdNotEqualTo(item.getTaskId());
         List<CashFlow> itemList = cashFlowMapper.selectByExample(example);
@@ -303,6 +306,7 @@ public class EbsApiServiceImpl implements EbsApiService {
 
     private void processBS(Long id,BalanceSheetQueryDto item) {
         BalanceSheetExample example = new BalanceSheetExample();
+        item.setTaskId(String.valueOf(id));
         //机构编码和期间
         example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdNotEqualTo(item.getTaskId());
         List<BalanceSheet> itemList = balanceSheetMapper.selectByExample(example);
@@ -331,6 +335,7 @@ public class EbsApiServiceImpl implements EbsApiService {
 
     private void processBSprc(Long id,BalanceSheetPrcQueryDto item) {
         BalanceSheetPrcExample example = new BalanceSheetPrcExample();
+        item.setTaskId(String.valueOf(id));
         //机构编码和期间
         example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdNotEqualTo(item.getTaskId());
         List<BalanceSheetPrc> itemList = balanceSheetPrcMapper.selectByExample(example);
@@ -358,6 +363,7 @@ public class EbsApiServiceImpl implements EbsApiService {
 
     private void processPL(Long id,ProfitLossStatementQueryDto item) {
         ProfitLossStatementExample example = new ProfitLossStatementExample();
+        item.setTaskId(String.valueOf(id));
         //机构编码和期间
         example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdNotEqualTo(item.getTaskId());
         List<ProfitLossStatement> itemList = profitLossStatementMapper.selectByExample(example);
@@ -385,6 +391,7 @@ public class EbsApiServiceImpl implements EbsApiService {
 
     private void processPLprc(Long id,ProfitLossStatementPrcQueryDto item) {
         ProfitLossStatementPrcExample example = new ProfitLossStatementPrcExample();
+        item.setTaskId(String.valueOf(id));
         //机构编码和期间
         example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdNotEqualTo(item.getTaskId());
         List<ProfitLossStatementPrc> itemList = profitLossStatementPrcMapper.selectByExample(example);
@@ -412,6 +419,7 @@ public class EbsApiServiceImpl implements EbsApiService {
 
     private void processOAR(Long id,OrganizationAccountingRateQueryDto item) {
         OrganizationAccountingRateExample example = new OrganizationAccountingRateExample();
+        item.setTaskId(String.valueOf(id));
         //期间
         example.createCriteria().andPeriodEqualTo(convertPeriod12(item.getPeriod())).andTaskIdNotEqualTo(item.getTaskId());
         List<OrganizationAccountingRate> itemList = organizationAccountingRateMapper.selectByExample(example);
@@ -783,6 +791,19 @@ public class EbsApiServiceImpl implements EbsApiService {
         logger.debug("end queryRemoteServerThenUpdateOrg 机构表,took [{}] ms", System.currentTimeMillis() - start);
     }
 
+    @Override
+    public void changeCallBackStatus(EbsCallBackDto ebsCallBackDto) {
+        DataImportLog dataImportLog = new DataImportLog();
+        dataImportLog.setId(ebsCallBackDto.getTaskId());
+        dataImportLog.setImportResult(ebsCallBackDto.getTaskStatus().equals("S")?true:false);
+        dataImportLog.setErrorMsg(ebsCallBackDto.getTaskDesc());
+        dataImportLog.setUpdateTime(new Date());
+        int res = dataImportLogMapper.updateByPrimaryKeySelective(dataImportLog);
+        if (res < 0) {
+            logger.warn(String.format("warn callBack end [%s]", ebsCallBackDto.getTaskId()));
+        }
+    }
+
     private void processORG(OrganizationQueryDto a) {
         // 机构信息
         OrganizationExample organizationExample = new OrganizationExample();
@@ -833,8 +854,6 @@ public class EbsApiServiceImpl implements EbsApiService {
         organizationEmployeeMapper.insertSelective(oe);
     }
 
-
-
     private void updateDataImportLog(Long id, int size) {
         DataImportLog dataImportLog = new DataImportLog();
         dataImportLog.setId(id);

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

@@ -14,7 +14,6 @@ import pwc.taxtech.atms.entity.OperationLogFileType;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * 查询
@@ -54,10 +53,11 @@ public class FileTypesServiceImpl {
             fileTypes.setCreateTime(new Date());
             fileTypes.setCreator(authUserHelper.getCurrentAuditor().get());
             fileTypes.setCreatorId(authUserHelper.getCurrentUserId());
-            int num = fileTypesMapper.insert(fileTypes);
-            if (num > 0) {
+            Long id = fileTypesMapper.insert(fileTypes);
+            if (id > 0) {
                 OperationLogFileType actionEntity = buildOperationLogFileType();
                 actionEntity.setOperationAction("新增");
+                actionEntity.setId(id.toString());
                 actionEntity.setUpdateState(fileTypes.toString());
                 boolean result = operationLogFileTypeService.addFileTypesList(actionEntity);
                 if (result) {
@@ -81,6 +81,7 @@ public class FileTypesServiceImpl {
             if (num > 0) {
                 OperationLogFileType actionEntity = buildOperationLogFileType();
                 actionEntity.setOperationAction("删除");
+                actionEntity.setId(id.toString());
                 boolean result = operationLogFileTypeService.addFileTypesList(actionEntity);
                 if (result) {
                     return true;
@@ -106,8 +107,8 @@ public class FileTypesServiceImpl {
             if (num > 0) {
                 OperationLogFileType actionEntity = buildOperationLogFileType();
                 actionEntity.setOperationAction("更新");
+                actionEntity.setId(fileTypes.getId().toString());
                 //设置更新值
-                actionEntity.setOriginalState(fileTypesMapper.selectByPrimaryKey(fileTypes.getId()).toString());
                 actionEntity.setUpdateState(fileTypes.toString());
                 boolean result = operationLogFileTypeService.addFileTypesList(actionEntity);
                 if (result) {
@@ -131,7 +132,6 @@ public class FileTypesServiceImpl {
      */
     private OperationLogFileType buildOperationLogFileType() {
         OperationLogFileType actionEntity = new OperationLogFileType();
-        actionEntity.setId("FileType:"+UUID.randomUUID().toString());
         actionEntity.setOperationContent("系统管理");
         actionEntity.setModuleName("档案管理");
         actionEntity.setOperationObject("税务档案类型设置");

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

@@ -123,11 +123,13 @@ public class ReportFileUploadService extends BaseService {
         }
         if (StringUtils.isBlank(data.getProjectId()) && StringUtils.isNotBlank(data.getOrgId()) && data.getPeriod() != null) {
             ProjectExample projectExample = new ProjectExample();
-            projectExample.createCriteria().andOrganizationIdEqualTo(data.getOrgId()).andYearEqualTo(data.getPeriod()/100);
+            String year = String.valueOf(data.getPeriod()).substring(0,4);
+            projectExample.createCriteria().andOrganizationIdEqualTo(data.getOrgId()).andYearEqualTo(Integer.valueOf(year));
             List<Project> projects = projectMapper.selectByExample(projectExample);
             if(CollectionUtils.isNotEmpty(projects)){
                 data.setProjectId(projects.get(0).getId());
-
+            }else{
+                return;
             }
 
         }else {

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

@@ -152,21 +152,24 @@ public class TaxDocumentServiceImpl {
                     ReportFileUpload reportFileUpload = new ReportFileUpload();
                     reportFileUpload.setOrgId(taxDocument.getCompanyId());
                     reportFileUpload.setSourceType(ReportFileUploadEnum.SuorceType.RECORD.name());
-                    reportFileUpload.setPeriod(taxDocument.getOwnTime()/100);
+                    String period = String.valueOf(taxDocument.getOwnTime()).substring(0,6);
+                    reportFileUpload.setPeriod(Integer.valueOf(period));
                     reportFileUpload.setFileUploadId(fileUpload.getUid());
                     reportFileUpload.setReportType(taxDocument.getFileType());
-//                    reportFileUploadService.saveData(file,reportFileUpload);
+                    reportFileUploadService.saveData(file,reportFileUpload);
                 }
             }
             //设置创建人 创建时间信息 设置年份区分
             taxDocument.setCreateTime(new Date());
+            taxDocument.setUpdateTime(new Date());
             taxDocument.setCreator(authUserHelper.getCurrentAuditor().get());
             taxDocument.setCreatorId(authUserHelper.getCurrentUserId());
             taxDocument.setUploadTime(new Date());
             taxDocument.setYearRedundancy(Calendar.getInstance().get(Calendar.YEAR));
-            int num = taxDocumentMapper.insert(taxDocument);
-            if (num > 0) {
+            Long id = taxDocumentMapper.insert(taxDocument);
+            if (id > 0) {
                 OperationLogTaxDocument actionEntity = buildOperationLogTaxDocument();
+                actionEntity.setId(id.toString());
                 actionEntity.setOperationAction("新增");
                 actionEntity.setUpdateState(taxDocument.toString());
                 boolean result = operationLogTaxDocService.addTaxDocumentList(actionEntity);
@@ -192,6 +195,7 @@ public class TaxDocumentServiceImpl {
             if (num > 0) {
                 OperationLogTaxDocument actionEntity = buildOperationLogTaxDocument();
                 actionEntity.setOperationAction("删除");
+                actionEntity.setId(id.toString());
                 boolean result = operationLogTaxDocService.addTaxDocumentList(actionEntity);
                 if (result) {
                     return true;
@@ -220,7 +224,20 @@ public class TaxDocumentServiceImpl {
                 return false;
             }
             for (Long id : ids) {
-                taxDocumentMapper.deleteByPrimaryKey(id);
+                int num = taxDocumentMapper.deleteByPrimaryKey(id);
+                if (num > 0) {
+                    OperationLogTaxDocument actionEntity = buildOperationLogTaxDocument();
+                    actionEntity.setOperationAction("删除");
+                    actionEntity.setId(id.toString());
+                    boolean result = operationLogTaxDocService.addTaxDocumentList(actionEntity);
+                    if (result) {
+                        return true;
+                    } else {
+                        throw new RuntimeException("TaxDocumentServiceImpl batchDeleteTaxDocument log error");
+                    }
+                } else {
+                    return false;
+                }
             }
             return true;
         } catch (Exception e) {
@@ -261,7 +278,6 @@ public class TaxDocumentServiceImpl {
      */
     private OperationLogTaxDocument buildOperationLogTaxDocument() {
         OperationLogTaxDocument actionEntity = new OperationLogTaxDocument();
-        actionEntity.setId("TaxDocument:" + UUID.randomUUID().toString());
         actionEntity.setOperationContent("主页");
         actionEntity.setModuleName("档案管理");
         actionEntity.setOperationObject("税务档案");

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

@@ -41,7 +41,7 @@ public interface FileTypesMapper extends MyMapper {
      *
      * @mbg.generated
      */
-    int insert(FileTypes record);
+    Long insert(FileTypes record);
 
     /**
      * This method was generated by MyBatis Generator.

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

@@ -41,7 +41,7 @@ public interface TaxDocumentMapper extends MyMapper {
      *
      * @mbg.generated
      */
-    int insert(TaxDocument record);
+    Long insert(TaxDocument record);
 
     /**
      * This method was generated by MyBatis Generator.

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

@@ -443,22 +443,16 @@ public class FileTypes implements Serializable {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", fileAttr=").append(fileAttr);
-        sb.append(", fileTypeId=").append(fileTypeId);
-        sb.append(", fileType=").append(fileType);
-        sb.append(", description=").append(description);
-        sb.append(", creatorId=").append(creatorId);
-        sb.append(", requiredField=").append(requiredField);
-        sb.append(", creator=").append(creator);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", status=").append(status);
-        sb.append(", remarks=").append(remarks);
-        sb.append("]");
+        sb.append("序号=").append(id);
+        sb.append(", 档案属性=").append(fileAttr);
+        sb.append(", 档案类型=").append(fileType);
+        sb.append(", 说明=").append(description);
+        sb.append(", 必填字段=").append(requiredField);
+        sb.append(", 创建人=").append(creator);
+        sb.append(", 创建时间=").append(createTime.toLocaleString());
+        sb.append(", 更新时间=").append(updateTime.toLocaleString());
+        sb.append(", 状态=").append("T".equals(status)?"启用":"未启用");
+        sb.append(", 说明=").append(remarks);
         return sb.toString();
     }
 

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

@@ -141,7 +141,7 @@ public class TaxDocument implements Serializable {
      *
      * @mbg.generated
      */
-    private int ownTime;
+    private Integer ownTime;
 
     /**
      *
@@ -344,11 +344,11 @@ public class TaxDocument implements Serializable {
         this.auditStatus = auditStatus;
     }
 
-    public int getOwnTime() {
+    public Integer getOwnTime() {
         return ownTime;
     }
 
-    public void setOwnTime(int ownTime) {
+    public void setOwnTime(Integer ownTime) {
         this.ownTime = ownTime;
     }
 
@@ -904,34 +904,27 @@ public class TaxDocument implements Serializable {
      */
     @Override
     public String toString() {
-        return "TaxDocument{" +
-                "id=" + id +
-                ", fileAttr='" + fileAttr + '\'' +
-                ", fileTypeId=" + fileTypeId +
-                ", fileType='" + fileType + '\'' +
-                ", fileName='" + fileName + '\'' +
-                ", businessLine='" + businessLine + '\'' +
-                ", companyId=" + companyId +
-                ", companyName='" + companyName + '\'' +
-                ", taxType='" + taxType + '\'' +
-                ", fileTime=" + fileTime +
-                ", effectiveTime=" + effectiveTime +
-                ", ownTime=" + ownTime +
-                ", creatorId='" + creatorId + '\'' +
-                ", creator='" + creator + '\'' +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                ", uploadTime=" + uploadTime +
-                ", storageArea='" + storageArea + '\'' +
-                ", keeperId='" + keeperId + '\'' +
-                ", keeper='" + keeper + '\'' +
-                ", physicalIndexNumber='" + physicalIndexNumber + '\'' +
-                ", remark='" + remark + '\'' +
-                ", fileOriginalName='" + fileOriginalName + '\'' +
-                ", filePositionUrl='" + filePositionUrl + '\'' +
-                ", yearRedundancy=" + yearRedundancy +
-                ", auditStatus=" + auditStatus +
-                ", enable='" + enable + '\'' +
-                '}';
+        StringBuilder sb = new StringBuilder();
+        sb.append("序号=").append(id);
+        sb.append("档案属性=").append(fileAttr);
+        sb.append("档案类型=").append(fileType);
+        sb.append("文件名称=").append(fileName);
+        sb.append("业务线=").append(businessLine);
+        sb.append("公司名称=").append(companyName);
+        sb.append("税种=").append(taxType);
+        sb.append("文件生效日期=").append(fileTime.toLocaleString());
+        sb.append("到期日=").append(effectiveTime.toLocaleString() );
+        sb.append("所属期间=").append(ownTime );
+        sb.append("创建人=").append(creator );
+        sb.append("创建时间=").append(createTime.toLocaleString());
+        sb.append("更新时间=").append(updateTime.toLocaleString());
+        sb.append("上传时间=").append(uploadTime.toLocaleString());
+        sb.append("实物存放地点=").append(storageArea );
+        sb.append("保管人=").append(keeper );
+        sb.append("实物索引号=").append(physicalIndexNumber );
+        sb.append("备注=").append(remark );
+        sb.append("审批状态=").append(auditStatus==0?"未审核":auditStatus==1?"审核通过":"审核不通过");
+        sb.append("是否可用=").append("T".equals(enable)?"启用":"未启用");
+        return  sb.toString();
     }
 }
\ No newline at end of file

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

@@ -745,6 +745,11 @@ public class TaxDocumentExample {
             return (Criteria) this;
         }
 
+        public Criteria andOwnTimeEqualTo(Integer value) {
+            addCriterion("own_time =", value, "ownTime");
+            return (Criteria) this;
+        }
+
         public Criteria andAuditStatusEqualTo(Integer value) {
             addCriterion("audit_status =", value, "auditStatus");
             return (Criteria) this;
@@ -860,16 +865,6 @@ public class TaxDocumentExample {
             return (Criteria) this;
         }
 
-        public Criteria andOwnTimeBetween(Date value1, Date value2) {
-            addCriterion("own_time between", value1, value2, "ownTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andOwnTimeEqualTo(Integer value) {
-            addCriterion("own_time =", value, "ownTime");
-            return (Criteria) this;
-        }
-
         public Criteria andFileTimeNotBetween(Date value1, Date value2) {
             addCriterion("file_time not between", value1, value2, "fileTime");
             return (Criteria) this;

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

@@ -8,7 +8,7 @@
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="file_attr" jdbcType="VARCHAR" property="fileAttr" />
-    <result column="file_type_id" jdbcType="BIGINT" property="fileTypeId" />
+    <result column="file_type_id" jdbcType="INTEGER" property="fileTypeId" />
     <result column="file_type" jdbcType="VARCHAR" property="fileType" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="creator_id" jdbcType="VARCHAR" property="creatorId" />
@@ -139,7 +139,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="pwc.taxtech.atms.entity.FileTypes">
+  <insert id="insert" keyProperty="id" useGeneratedKeys="true">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -148,7 +148,7 @@
     file_type, description, creator_id,
     creator, create_time, update_time,
     status, remarks,required_field_json)
-    values ( #{fileAttr,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=BIGINT},
+    values ( #{fileAttr,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=INTEGER},
     #{fileType,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{creatorId,jdbcType=VARCHAR},
     #{creator,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
     #{status,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR},#{requiredFieldJson})
@@ -254,7 +254,7 @@
         file_attr = #{record.fileAttr,jdbcType=VARCHAR},
       </if>
       <if test="record.fileTypeId != null">
-        file_type_id = #{record.fileTypeId,jdbcType=BIGINT},
+        file_type_id = #{record.fileTypeId,jdbcType=INTEGER},
       </if>
       <if test="record.fileType != null">
         file_type = #{record.fileType,jdbcType=VARCHAR},
@@ -293,7 +293,7 @@
     update file_types
     set id = #{record.id,jdbcType=BIGINT},
     file_attr = #{record.fileAttr,jdbcType=VARCHAR},
-      file_type_id = #{record.fileTypeId,jdbcType=BIGINT},
+    file_type_id = #{record.fileTypeId,jdbcType=INTEGER},
     file_type = #{record.fileType,jdbcType=VARCHAR},
     description = #{record.description,jdbcType=VARCHAR},
     creator_id = #{record.creatorId,jdbcType=VARCHAR},
@@ -317,7 +317,7 @@
         file_attr = #{fileAttr,jdbcType=VARCHAR},
       </if>
       <if test="fileTypeId != null">
-        file_type_id = #{fileTypeId,jdbcType=BIGINT},
+        file_type_id = #{fileTypeId,jdbcType=INTEGER},
       </if>
       <if test="fileType != null">
         file_type = #{fileType,jdbcType=VARCHAR},
@@ -357,7 +357,7 @@
         file_attr = #{fileAttr,jdbcType=VARCHAR},
       </if>
       <if test="fileTypeId != null and fileTypeId != ''">
-        file_type_id = #{fileTypeId,jdbcType=BIGINT},
+        file_type_id = #{fileTypeId,jdbcType=INTEGER},
       </if>
       <if test="fileType != null and fileType != ''">
         file_type = #{fileType,jdbcType=VARCHAR},

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

@@ -101,7 +101,7 @@
     <if test="distinct">
       distinct
     </if>
-    <include refid="Base_Column_List" />
+    id, operation_action, original_state, update_state, operation_user, ip, comment, create_time
     from operation_log_file_type
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

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

@@ -101,7 +101,7 @@
     <if test="distinct">
       distinct
     </if>
-    <include refid="Base_Column_List" />
+    id, operation_action, original_state, update_state, operation_user, ip, comment, create_time
     from operation_log_tax_document
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

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

@@ -8,7 +8,7 @@
         -->
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="file_attr" jdbcType="VARCHAR" property="fileAttr"/>
-        <result column="file_type_id" jdbcType="INTEGER" property="fileTypeId"/>
+        <result column="file_type_id" jdbcType="BIGINT" property="fileTypeId"/>
         <result column="file_type" jdbcType="VARCHAR" property="fileType"/>
         <result column="file_name" jdbcType="VARCHAR" property="fileName"/>
         <result column="business_line" jdbcType="VARCHAR" property="businessLine"/>
@@ -160,7 +160,7 @@
             <include refid="Example_Where_Clause"/>
         </if>
     </delete>
-    <insert id="insert" parameterType="pwc.taxtech.atms.entity.TaxDocument">
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         <!--
           WARNING - @mbg.generated
           This element is automatically generated by MyBatis Generator, do not modify.
@@ -173,7 +173,7 @@
         upload_time, storage_area, keeper_id,
         keeper, remark, file_original_name, file_upload_id, file_position_url,
         year_redundancy,audit_status,physical_index_number,own_time)
-        values (#{id,jdbcType=BIGINT}, #{fileAttr,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=INTEGER},
+        values (#{id,jdbcType=BIGINT}, #{fileAttr,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=BIGINT},
         #{fileType,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{businessLine,jdbcType=VARCHAR},
         #{companyId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{taxType,jdbcType=VARCHAR},
         #{fileTime,jdbcType=TIMESTAMP}, #{effectiveTime,jdbcType=TIMESTAMP}, #{creatorId,jdbcType=INTEGER},
@@ -351,7 +351,7 @@
                 file_attr = #{record.fileAttr,jdbcType=VARCHAR},
             </if>
             <if test="record.fileTypeId != null">
-                file_type_id = #{record.fileTypeId,jdbcType=INTEGER},
+                file_type_id = #{record.fileTypeId,jdbcType=BIGINT},
             </if>
             <if test="record.fileType != null">
                 file_type = #{record.fileType,jdbcType=VARCHAR},
@@ -423,7 +423,7 @@
         update tax_document
         set id = #{record.id,jdbcType=BIGINT},
         file_attr = #{record.fileAttr,jdbcType=VARCHAR},
-        file_type_id = #{record.fileTypeId,jdbcType=INTEGER},
+        file_type_id = #{record.fileTypeId,jdbcType=BIGINT},
         file_type = #{record.fileType,jdbcType=VARCHAR},
         file_name = #{record.fileName,jdbcType=VARCHAR},
         business_line = #{record.businessLine,jdbcType=VARCHAR},
@@ -461,7 +461,7 @@
                 file_attr = #{fileAttr,jdbcType=VARCHAR},
             </if>
             <if test="fileTypeId != null">
-                file_type_id = #{fileTypeId,jdbcType=INTEGER},
+                file_type_id = #{fileTypeId,jdbcType=BIGINT},
             </if>
             <if test="fileType != null">
                 file_type = #{fileType,jdbcType=VARCHAR},
@@ -534,7 +534,7 @@
                 file_attr = #{fileAttr,jdbcType=VARCHAR},
             </if>
             <if test="null != fileTypeId">
-                file_type_id = #{fileTypeId,jdbcType=INTEGER},
+                file_type_id = #{fileTypeId,jdbcType=BIGINT},
             </if>
             <if test="null != fileType and '' != fileType">
                 file_type = #{fileType,jdbcType=VARCHAR},

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

@@ -194,6 +194,6 @@
     "SystemTypeCannotDelete": "系统类型不能删除",
     "OrganizationUsedTemplateGroup": "有机构在使用，不能删除",
     "Industry": "行业：",
-    "SearchHintText": "搜索"
-
+    "SearchHintText": "搜索",
+    "DescriptionWithOutColon": "Description"
 }
\ No newline at end of file

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

@@ -52,6 +52,7 @@
     "DefaultTaxTypeAndReport": "默认纳税类型及报表：",
     "DeleteKeyValueConfiguration": "删除关键数据",
     "Description": "描述：",
+    "DescriptionWithOutColon": "描述",
     "DirectionDifferent": "借贷方向不一致",
     "EnterpriceAccountMapping": "自动对应",
     "EtsSubjectNameCol": "对应企业科目",

atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html

 
 <div class="land-manage-page">
+    <style>
+        .DM-state-label{
+            margin: 0;
+            height: 27px;
+            line-height: 34px;
+            float: none;
+        }
+    </style>
     <div class="menu-header">
         <div class="menu-title" translate="DocumentTypeSets"></div>
         <div class="menu-log">
@@ -47,12 +55,15 @@
                                        id="SequenceNoCol"
                                        placeholder="0004"
                                        ng-model="editModel.id"
-                                       readonly style="width:320px;" maxlength="20" />
+                                       readonly style="width:320px;"/>
                             </div>
                         </div>
                         <!--档案属性-->
                         <div class="form-group">
-                            <label for="DocumentAttr" class="col-sm-3 control-label" translate="DocumentAttr"></label>
+                            <label for="DocumentAttr" class="col-sm-3 control-label">
+                                <span style="color:red"> * </span>
+                                <span  translate="DocumentAttr"></span>
+                            </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <input class="form-control"
                                        id="DocumentAttr"
@@ -60,13 +71,17 @@
                                        ng-model="editModel.fileAttr"
                                        required style="width:320px;" maxlength="50" />
                             </div>
-                            <div style="margin-top:7px;">
-                                <span style="color:red"> * <span translate="Require"></span> </span>
-                            </div>
+                            <!--<div style="margin-top:7px;">-->
+                            <!--<span style="color:red"> * <span translate="Require"></span> </span>-->
+                            <!--</div>-->
                         </div>
                         <!--档案类型-->
                         <div class="form-group">
-                            <label for="DocumentType" class="col-sm-3 control-label" translate="DocumentType"></label>
+
+                            <label for="DocumentType" class="col-sm-3 control-label">
+                                <span style="color:red"> * </span>
+                                <span  translate="DocumentType"></span>
+                            </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <input class="form-control"
                                        id="DocumentType"
@@ -74,13 +89,16 @@
                                        ng-model="editModel.fileType"
                                        required style="width:320px;" maxlength="50" />
                             </div>
-                            <div style="margin-top:7px;">
-                                <span style="color:red"> * <span translate="Require"></span> </span>
-                            </div>
+                            <!--<div style="margin-top:7px;">-->
+                            <!--<span style="color:red"> * <span translate="Require"></span> </span>-->
+                            <!--</div>-->
                         </div>
                         <!--说明-->
                         <div class="form-group">
-                            <label for="Description" class="col-sm-3 control-label" translate="Description"></label>
+                            <label for="Description" class="col-sm-3 control-label">
+                                <span style="color:red"> * </span>
+                                <span  translate="DescriptionWithOutColon"></span>
+                            </label>
                             <div class="col-sm-11" style="width:61.67%">
                                 <input class="form-control" id="Description"
                                        ng-model="editModel.description"
@@ -90,7 +108,11 @@
                         </div>
                         <!--必填字段-->
                         <div class="form-group">
-                            <label class="col-sm-3 control-label" translate="RequiredFields"></label>
+
+                            <label class="col-sm-3 control-label">
+                                <span style="color:red"> * </span>
+                                <span  translate="RequiredFields"></span>
+                            </label>
                             <div class="col-sm-11" style="width:61.67%" id="appMultiSelectContainer">
                                 <!--<app-multi-select class="form-control" style="width:320px;"-->
                                 <!--this-option-map="editRequiredFieldsMap"-->
@@ -98,9 +120,9 @@
                                 <!--this-default-checked="editModel.requiredField"-->
                                 <!--&gt;</app-multi-select>-->
                             </div>
-                            <div style="margin-top:7px;">
-                                <span style="color:red"> * <span translate="Require"></span> </span>
-                            </div>
+                            <!--<div style="margin-top:7px;">-->
+                            <!--<span style="color:red"> * <span translate="Require"></span> </span>-->
+                            <!--</div>-->
                         </div>
                         <!--备注-->
                         <div class="form-group">
@@ -114,16 +136,19 @@
                         </div>
                         <!--状态-->
                         <div class="form-group">
-                            <label class="col-sm-3 control-label" translate="State"></label>
-                            <div class="col-sm-11" style="width:61.67%">
 
-                                <label class="col-sm-5">
+                            <label class="col-sm-3 control-label">
+                                <span style="color:red"> * </span>
+                                <span  translate="State"></span>
+                            </label>
+                            <div class="col-sm-11" style="width:61.67%">
+                                <label class="col-sm-5 DM-state-label">
                                     <input type="radio" name="editModelState"
                                            value=1
                                            ng-model="editModel.status" required />
                                     <span translate="Enable"></span>
                                 </label>
-                                <label class="col-sm-5">
+                                <label class="col-sm-5 DM-state-label">
                                     <input type="radio"  name="editModelState"
                                            value=0
                                            ng-model="editModel.status" required />
@@ -132,9 +157,9 @@
 
 
                             </div>
-                            <div style="margin-top:7px;">
-                                <span style="color:red"> * <span translate="Require"></span> </span>
-                            </div>
+                            <!--<div style="margin-top:7px;">-->
+                            <!--<span style="color:red"> * <span translate="Require"></span> </span>-->
+                            <!--</div>-->
                         </div>