Skip to content

T
traffic-front
Commit 662ee90a authored by zhkwei's avatar zhkwei
Browse files
Options

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

parents 5241a337 0de392d6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 828 additions and 26 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/WorkflowController.java 0 → 100644
View file @ 662ee90a
package pwc.taxtech.atms.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import pwc.taxtech.atms.service.impl.WorkflowService;
@RestController
@RequestMapping("/api/v1/workflow/")
public class WorkflowController extends BaseController {
@Autowired
private WorkflowService workflowService;
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DidiFileUploadService.java
View file @ 662ee90a
......@@ -261,7 +261,7 @@ public class DidiFileUploadService extends BaseService {
String[] params = tmpPost.getURI().getQuery().split("&");
Long time = new Long(params[0].replace("expire=", ""));
Date useFullDate = new Date();
useFullDate.setTime(new Date().getTime() + time - 7200);
useFullDate.setTime(new Date().getTime() + time - (3600*1000*24*2));
fileUpload.setUsefulEndTime(useFullDate);
return fileUpload;
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/WorkflowService.java 0 → 100644
View file @ 662ee90a
package pwc.taxtech.atms.service.impl;
import org.springframework.stereotype.Service;
import pwc.taxtech.atms.dao.WfRecordDetailMapper;
import pwc.taxtech.atms.dao.WfRecordMapper;
import javax.annotation.Resource;
@Service
public class WorkflowService extends BaseService {
@Resource
private WfRecordMapper wfRecordMapper;
@Resource
private WfRecordDetailMapper wfRecordDetailMapper;
}
atms-api/src/main/resources/bpmn/approval.bpmn
View file @ 662ee90a
......@@ -2,7 +2,7 @@
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/testm1539848247913" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1539848247913" name="" targetNamespace="http://www.activiti.org/testm1539848247913" typeLanguage="http://www.w3.org/2001/XMLSchema">
<process id="approvalProcess" isClosed="false" isExecutable="true" name="ApprovalProcess" processType="None">
<startEvent id="_2" name="StartEvent"/>
<userTask activiti:assignee="accountant" activiti:exclusive="true" id="_3" name="税务会计"/>
<userTask activiti:assignee="accountant" activiti:candidateGroups="role1,role2,role3" activiti:exclusive="true" id="_3" name="税务会计"/>
<sequenceFlow id="_4" sourceRef="_2" targetRef="_3"/>
<userTask activiti:assignee="manager" activiti:exclusive="true" id="_5" name="税务经理"/>
<endEvent id="_7" name="EndEvent"/>
......@@ -23,6 +23,7 @@
<sequenceFlow id="_16" name="已提交" sourceRef="_11" targetRef="_9">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${committed==1}]]></conditionExpression>
</sequenceFlow>
<serviceTask activiti:exclusive="true" id="_6" name="ServiceTask"/>
</process>
<bpmndi:BPMNDiagram documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
<bpmndi:BPMNPlane bpmnElement="approvalProcess">
......@@ -68,50 +69,56 @@
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_6" id="Shape-_6">
<dc:Bounds height="55.0" width="85.0" x="255.0" y="145.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="_13" id="BPMNEdge__13" sourceElement="_5" targetElement="_12">
<di:waypoint x="510.0" y="192.5"/>
<di:waypoint x="495.0" y="192.5"/>
<di:waypoint x="640.0" y="191.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_15" id="BPMNEdge__15" sourceElement="_11" targetElement="_5">
<di:waypoint x="456.0" y="365.0"/>
<di:waypoint x="456.0" y="380.0"/>
<di:waypoint x="456.0" y="220.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_14" id="BPMNEdge__14" sourceElement="_3" targetElement="_11">
<di:waypoint x="290.0" y="397.5"/>
<di:waypoint x="275.0" y="397.5"/>
<di:waypoint x="440.0" y="396.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_16" id="BPMNEdge__16" sourceElement="_11" targetElement="_9">
<di:waypoint x="487.0" y="396.0"/>
<di:waypoint x="472.0" y="396.0"/>
<di:waypoint x="760.0" y="396.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_4" id="BPMNEdge__4" sourceElement="_2" targetElement="_3">
<di:waypoint x="97.0" y="396.0"/>
<di:waypoint x="82.0" y="396.0"/>
<di:waypoint x="190.0" y="397.5"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_12" targetElement="_7">
<di:waypoint x="687.0" y="191.0"/>
<di:waypoint x="672.0" y="191.0"/>
<di:waypoint x="765.0" y="121.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_10" id="BPMNEdge__10" sourceElement="_12" targetElement="_9">
<di:waypoint x="687.0" y="191.0"/>
<di:waypoint x="672.0" y="191.0"/>
<di:waypoint x="760.0" y="396.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
......
atms-dao/etc/generator-mysql/generatorConfig.xml
View file @ 662ee90a
......@@ -8,13 +8,13 @@
<!-- <classPathEntry location="../hsqldb/hsqldb-2.3.5.jar" /> -->
<context id="contextId" targetRuntime="MyBatis3">
<!-- 考虑需要兼容DB2与ORCAL数据库, 大部份字段不需要加双引号，autoDelimitKeywords设置为false -->
<property name="autoDelimitKeywords" value="false"/>
<property name="autoDelimitKeywords" value="true"/>
<property name="javaFileEncoding" value="UTF-8"/>
<!-- beginningDelimiter和endingDelimiter：指明数据库的用于标记数据库对象名的符号，比如ORACLE就是双引号，MYSQL默认是`反引号； -->
<property name="beginningDelimiter" value="`"/>
<property name="endingDelimiter" value="`"/>
<plugin type="org.mybatis.generator.plugins.MapperAnnotationPlugin"/>
<plugin type="org.mybatis.generator.plugins.RowBoundsPlugin"/>
<!-- <plugin type="org.mybatis.generator.plugins.RowBoundsPlugin"/>-->
<plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
<plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
<commentGenerator>
......@@ -41,13 +41,26 @@
<property name="rootInterface" value="pwc.taxtech.atms.MyMapper"/>
</javaClientGenerator>
<table tableName="data_import_log" domainObjectName="DataImportLog">
<table tableName="wf_record" domainObjectName="WfRecord">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="period" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="type" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="tms_period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="status" javaType="java.lang.Integer" jdbcType="TINYINT"/>
</table>
<table tableName="wf_record_detail" domainObjectName="WfRecordDetail">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="status" javaType="java.lang.Integer" jdbcType="TINYINT"/>
</table>
<!-- <table tableName="data_import_log" domainObjectName="DataImportLog">-->
<!-- <property name="useActualColumnNames" value="false"/>-->
<!-- <property name="ignoreQualifiersAtRuntime" value="true"/>-->
<!-- <columnOverride column="type" javaType="java.lang.Integer" jdbcType="TINYINT"/>-->
<!-- <columnOverride column="tms_period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>-->
<!-- <columnOverride column="period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>-->
<!-- </table>-->
<!--<table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">-->
<!--<property name="useActualColumnNames" value="false"/>-->
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/WfRecordDetailMapper.java 0 → 100644
View file @ 662ee90a
package pwc.taxtech.atms.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.WfRecordDetail;
import pwc.taxtech.atms.entity.WfRecordDetailExample;
@Mapper
public interface WfRecordDetailMapper extends MyMapper {
long countByExample(WfRecordDetailExample example);
int deleteByExample(WfRecordDetailExample example);
int deleteByPrimaryKey(Long id);
int insert(WfRecordDetail record);
int insertSelective(WfRecordDetail record);
List<WfRecordDetail> selectByExample(WfRecordDetailExample example);
WfRecordDetail selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") WfRecordDetail record, @Param("example") WfRecordDetailExample example);
int updateByExample(@Param("record") WfRecordDetail record, @Param("example") WfRecordDetailExample example);
int updateByPrimaryKeySelective(WfRecordDetail record);
int updateByPrimaryKey(WfRecordDetail record);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/dao/WfRecordMapper.java 0 → 100644
View file @ 662ee90a
package pwc.taxtech.atms.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.WfRecord;
import pwc.taxtech.atms.entity.WfRecordExample;
@Mapper
public interface WfRecordMapper extends MyMapper {
long countByExample(WfRecordExample example);
int deleteByExample(WfRecordExample example);
int deleteByPrimaryKey(Long id);
int insert(WfRecord record);
int insertSelective(WfRecord record);
List<WfRecord> selectByExample(WfRecordExample example);
WfRecord selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") WfRecord record, @Param("example") WfRecordExample example);
int updateByExample(@Param("record") WfRecord record, @Param("example") WfRecordExample example);
int updateByPrimaryKeySelective(WfRecord record);
int updateByPrimaryKey(WfRecord record);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/WfRecord.java 0 → 100644
View file @ 662ee90a
package pwc.taxtech.atms.entity;
import java.io.Serializable;
public class WfRecord extends BaseEntity implements Serializable {
/**
*
*/
private Long id;
/**
* 机构ID
*/
private String orgId;
/**
* 项目ID
*/
private Long projectId;
/**
* 年
*/
private Integer year;
/**
* 期间
*/
private Integer period;
/**
* 类型 0:通用 1:VAT 2:CIT 3:税金计算表
*/
private Integer type;
/**
* ACT实例ID
*/
private String actInstId;
/**
* 状态 0:审批中 1:通过 2:驳回
*/
private Integer status;
/**
* 流程发起人ID
*/
private String uid;
/**
* 备注
*/
private String comment;
/**
* wf_record
*/
private static final long serialVersionUID = 1L;
/**
* @return id
*/
public Long getId() {
return id;
}
/**
* @param id
*/
public void setId(Long id) {
this.id = id;
}
/**
* @return org_id 机构ID
*/
public String getOrgId() {
return orgId;
}
/**
* @param orgId 机构ID
*/
public void setOrgId(String orgId) {
this.orgId = orgId == null ? null : orgId.trim();
}
/**
* @return project_id 项目ID
*/
public Long getProjectId() {
return projectId;
}
/**
* @param projectId 项目ID
*/
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
/**
* @return year 年
*/
public Integer getYear() {
return year;
}
/**
* @param year 年
*/
public void setYear(Integer year) {
this.year = year;
}
/**
* @return period 期间
*/
public Integer getPeriod() {
return period;
}
/**
* @param period 期间
*/
public void setPeriod(Integer period) {
this.period = period;
}
/**
* @return type 类型 0:通用 1:VAT 2:CIT 3:税金计算表
*/
public Integer getType() {
return type;
}
/**
* @param type 类型 0:通用 1:VAT 2:CIT 3:税金计算表
*/
public void setType(Integer type) {
this.type = type;
}
/**
* @return act_inst_id ACT实例ID
*/
public String getActInstId() {
return actInstId;
}
/**
* @param actInstId ACT实例ID
*/
public void setActInstId(String actInstId) {
this.actInstId = actInstId == null ? null : actInstId.trim();
}
/**
* @return status 状态 0:审批中 1:通过 2:驳回
*/
public Integer getStatus() {
return status;
}
/**
* @param status 状态 0:审批中 1:通过 2:驳回
*/
public void setStatus(Integer status) {
this.status = status;
}
/**
* @return uid 流程发起人ID
*/
public String getUid() {
return uid;
}
/**
* @param uid 流程发起人ID
*/
public void setUid(String uid) {
this.uid = uid == null ? null : uid.trim();
}
/**
* @return comment 备注
*/
public String getComment() {
return comment;
}
/**
* @param comment 备注
*/
public void setComment(String comment) {
this.comment = comment == null ? null : comment.trim();
}
@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(", orgId=").append(orgId);
sb.append(", projectId=").append(projectId);
sb.append(", year=").append(year);
sb.append(", period=").append(period);
sb.append(", type=").append(type);
sb.append(", actInstId=").append(actInstId);
sb.append(", status=").append(status);
sb.append(", uid=").append(uid);
sb.append(", comment=").append(comment);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/WfRecordDetail.java 0 → 100644
View file @ 662ee90a
package pwc.taxtech.atms.entity;
import java.io.Serializable;
public class WfRecordDetail extends BaseEntity implements Serializable {
/**
*
*/
private Long id;
/**
* 工作流主表ID
*/
private Long recordId;
/**
* ACT实例ID
*/
private String actInstId;
/**
* ACT任务ID
*/
private String actTaskId;
/**
* UID
*/
private String uid;
/**
* 状态 0:审批中 1:通过 2:驳回
*/
private Integer status;
/**
* 备注
*/
private String comment;
/**
* wf_record_detail
*/
private static final long serialVersionUID = 1L;
/**
* @return id
*/
public Long getId() {
return id;
}
/**
* @param id
*/
public void setId(Long id) {
this.id = id;
}
/**
* @return record_id 工作流主表ID
*/
public Long getRecordId() {
return recordId;
}
/**
* @param recordId 工作流主表ID
*/
public void setRecordId(Long recordId) {
this.recordId = recordId;
}
/**
* @return act_inst_id ACT实例ID
*/
public String getActInstId() {
return actInstId;
}
/**
* @param actInstId ACT实例ID
*/
public void setActInstId(String actInstId) {
this.actInstId = actInstId == null ? null : actInstId.trim();
}
/**
* @return act_task_id ACT任务ID
*/
public String getActTaskId() {
return actTaskId;
}
/**
* @param actTaskId ACT任务ID
*/
public void setActTaskId(String actTaskId) {
this.actTaskId = actTaskId == null ? null : actTaskId.trim();
}
/**
* @return uid UID
*/
public String getUid() {
return uid;
}
/**
* @param uid UID
*/
public void setUid(String uid) {
this.uid = uid == null ? null : uid.trim();
}
/**
* @return status 状态 0:审批中 1:通过 2:驳回
*/
public Integer getStatus() {
return status;
}
/**
* @param status 状态 0:审批中 1:通过 2:驳回
*/
public void setStatus(Integer status) {
this.status = status;
}
/**
* @return comment 备注
*/
public String getComment() {
return comment;
}
/**
* @param comment 备注
*/
public void setComment(String comment) {
this.comment = comment == null ? null : comment.trim();
}
@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(", recordId=").append(recordId);
sb.append(", actInstId=").append(actInstId);
sb.append(", actTaskId=").append(actTaskId);
sb.append(", uid=").append(uid);
sb.append(", status=").append(status);
sb.append(", comment=").append(comment);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml
View file @ 662ee90a
......@@ -23,7 +23,8 @@
when tbf.segment3 like '4001%' and rc.id is null then 1
when tbf.segment3 like '4002%' and rc.id is null then 1
when tbf.segment3 like '4010%' and rc.id is null then 1
when tbf.segment3 like '8002%' and rc.id is null then 1
when tbf.segment3 like '800201%' and rc.id is null then 1
when tbf.segment3 like '800209%' and rc.id is null then 1
<![CDATA[WHEN rc.id IS NOT NULL and (rc.start_date > #{queryDate} or rc.end_date < #{queryDate}) then 1]]>
<![CDATA[WHEN rc.id IS NOT NULL and rc.start_date <= #{queryDate} and rc.end_date >= #{queryDate} THEN 2]]>
else 3 end as emptyCode
......
atms-dao/src/test/java/pwc/taxtech/atms/gen/MyBatisGeneratorTest.java
View file @ 662ee90a
......@@ -16,7 +16,7 @@ public class MyBatisGeneratorTest {
List<String> warnings = new ArrayList<>();
boolean overwrite = true;
//配置文件
// File configFile = new File(MyBatisGeneratorTest.class.getClassLoader().getResource("generatorConfig.xml").getPath());
// File configFile = new File(MyBatisGeneratorTest.class.getClassLoader().getResource("vatGeneratorConfig.xml").getPath());
File configFile = new File(MyBatisGeneratorTest.class.getClassLoader().getResource("generatorConfig.xml").getPath());
ConfigurationParser cp = new ConfigurationParser(warnings);
Configuration config = cp.parseConfiguration(configFile);
......
atms-dao/src/test/java/pwc/taxtech/atms/gen/SimpleCommentGenerator.java 0 → 100644
View file @ 662ee90a
package pwc.taxtech.atms.gen;
import org.mybatis.generator.api.CommentGenerator;
import org.mybatis.generator.api.IntrospectedColumn;
import org.mybatis.generator.api.IntrospectedTable;
import org.mybatis.generator.api.dom.java.*;
import org.mybatis.generator.api.dom.xml.XmlElement;
import org.mybatis.generator.config.MergeConstants;
import org.mybatis.generator.config.PropertyRegistry;
import org.mybatis.generator.internal.util.StringUtility;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
import java.util.Set;
public class SimpleCommentGenerator implements CommentGenerator {
private Properties properties;
// private Properties systemPro;
private boolean suppressDate;
private boolean suppressAllComments;
private String currentDateStr;
public SimpleCommentGenerator() {
super();
properties = new Properties();
// systemPro = System.getProperties();
suppressDate = false;
suppressAllComments = false;
currentDateStr = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
}
public void addJavaFileComment(CompilationUnit compilationUnit) {
// add no file level comments by default
}
/**
* Adds a suitable comment to warn users that the element was generated, and
* when it was generated.
*/
public void addComment(XmlElement xmlElement) {
}
public void addRootComment(XmlElement rootElement) {
// add no document level comments by default
}
@Override
public void addGeneralMethodAnnotation(Method method, IntrospectedTable introspectedTable, Set<FullyQualifiedJavaType> imports) {
}
@Override
public void addGeneralMethodAnnotation(Method method, IntrospectedTable introspectedTable, IntrospectedColumn introspectedColumn, Set<FullyQualifiedJavaType> imports) {
}
@Override
public void addFieldAnnotation(Field field, IntrospectedTable introspectedTable, Set<FullyQualifiedJavaType> imports) {
}
@Override
public void addFieldAnnotation(Field field, IntrospectedTable introspectedTable, IntrospectedColumn introspectedColumn, Set<FullyQualifiedJavaType> imports) {
}
@Override
public void addClassAnnotation(InnerClass innerClass, IntrospectedTable introspectedTable, Set<FullyQualifiedJavaType> imports) {
}
public void addConfigurationProperties(Properties properties) {
this.properties.putAll(properties);
suppressDate = StringUtility.isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_DATE));
suppressAllComments = StringUtility.isTrue(properties.getProperty(PropertyRegistry.COMMENT_GENERATOR_SUPPRESS_ALL_COMMENTS));
}
/**
* This method adds the custom javadoc tag for. You may do nothing if you do
* not wish to include the Javadoc tag - however, if you do not include the
* Javadoc tag then the Java merge capability of the eclipse plugin will
* break.
*
* @param javaElement the java element
*/
protected void addJavadocTag(JavaElement javaElement, boolean markAsDoNotDelete) {
javaElement.addJavaDocLine(" *");
StringBuilder sb = new StringBuilder();
sb.append(" * ");
sb.append(MergeConstants.NEW_ELEMENT_TAG);
if (markAsDoNotDelete) {
sb.append(" do_not_delete_during_merge");
}
String s = getDateString();
if (s != null) {
sb.append(' ');
sb.append(s);
}
javaElement.addJavaDocLine(sb.toString());
}
/**
* This method returns a formated date string to include in the Javadoc tag
* and XML comments. You may return null if you do not want the date in
* these documentation elements.
*
* @return a string representing the current timestamp, or null
*/
protected String getDateString() {
String result = null;
if (!suppressDate) {
result = currentDateStr;
}
return result;
}
public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable) {
if (suppressAllComments) {
return;
}
StringBuilder sb = new StringBuilder();
innerClass.addJavaDocLine("/**");
sb.append(" * ");
sb.append(introspectedTable.getFullyQualifiedTable());
sb.append(" ");
sb.append(getDateString());
innerClass.addJavaDocLine(sb.toString());
innerClass.addJavaDocLine(" */");
}
public void addEnumComment(InnerEnum innerEnum, IntrospectedTable introspectedTable) {
if (suppressAllComments) {
return;
}
StringBuilder sb = new StringBuilder();
innerEnum.addJavaDocLine("/**");
// addJavadocTag(innerEnum, false);
sb.append(" * ");
sb.append(introspectedTable.getFullyQualifiedTable());
innerEnum.addJavaDocLine(sb.toString());
innerEnum.addJavaDocLine(" */");
}
public void addFieldComment(Field field, IntrospectedTable introspectedTable,
IntrospectedColumn introspectedColumn) {
if (suppressAllComments) {
return;
}
StringBuilder sb = new StringBuilder();
field.addJavaDocLine("/**");
sb.append(" * ");
sb.append(introspectedColumn.getRemarks());
field.addJavaDocLine(sb.toString());
// addJavadocTag(field, false);
field.addJavaDocLine(" */");
}
public void addFieldComment(Field field, IntrospectedTable introspectedTable) {
if (suppressAllComments) {
return;
}
StringBuilder sb = new StringBuilder();
field.addJavaDocLine("/**");
sb.append(" * ");
sb.append(introspectedTable.getFullyQualifiedTable());
field.addJavaDocLine(sb.toString());
field.addJavaDocLine(" */");
}
public void addModelClassComment(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
}
public void addGeneralMethodComment(Method method, IntrospectedTable introspectedTable) {
if (suppressAllComments) {
return;
}
// method.addJavaDocLine("/**");
// addJavadocTag(method, false);
// method.addJavaDocLine(" */");
}
public void addGetterComment(Method method, IntrospectedTable introspectedTable,
IntrospectedColumn introspectedColumn) {
if (suppressAllComments) {
return;
}
method.addJavaDocLine("/**");
StringBuilder sb = new StringBuilder();
// sb.append(" * ");
// sb.append(introspectedColumn.getRemarks());
// method.addJavaDocLine(sb.toString());
sb.setLength(0);
sb.append(" * @return ");
sb.append(introspectedColumn.getActualColumnName());
sb.append(" ");
sb.append(introspectedColumn.getRemarks());
method.addJavaDocLine(sb.toString());
// addJavadocTag(method, false);
method.addJavaDocLine(" */");
}
public void addSetterComment(Method method, IntrospectedTable introspectedTable,
IntrospectedColumn introspectedColumn) {
if (suppressAllComments) {
return;
}
method.addJavaDocLine("/**");
StringBuilder sb = new StringBuilder();
// sb.append(" * ");
// sb.append(introspectedColumn.getRemarks());
// method.addJavaDocLine(sb.toString());
Parameter parm = method.getParameters().get(0);
sb.setLength(0);
sb.append(" * @param ");
sb.append(parm.getName());
sb.append(" ");
sb.append(introspectedColumn.getRemarks());
method.addJavaDocLine(sb.toString());
// addJavadocTag(method, false);
method.addJavaDocLine(" */");
}
public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable, boolean markAsDoNotDelete) {
// if (suppressAllComments) {
// return;
// }
// StringBuilder sb = new StringBuilder();
//
// innerClass.addJavaDocLine("/**");
// sb.append(" * ");
// sb.append(introspectedTable.getFullyQualifiedTable());
// innerClass.addJavaDocLine(sb.toString());
//
// sb.setLength(0);
// sb.append(" * @author ");
// sb.append(systemPro.getProperty("user.name"));
// sb.append(" ");
// sb.append(currentDateStr);
//
// // addJavadocTag(innerClass, markAsDoNotDelete);
//
// innerClass.addJavaDocLine(" */");
}
}
\ No newline at end of file
atms-dao/src/test/resources/generator.properties 0 → 100644
View file @ 662ee90a
jdbc.driverClass=com.mysql.jdbc.Driver
jdbc.connectionURL=jdbc:mysql://10.158.230.16:3306/tax_admin_didi?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;useSSL=false
jdbc.userId=root
jdbc.password=taxadmin2018
atms-dao/src/test/resources/generatorConfig.xml 0 → 100644
View file @ 662ee90a
This diff is collapsed.
atms-web/src/main/webapp/Scripts/bootstrp-confirm/bootstrap-confirm.js
View file @ 662ee90a
......@@ -2,7 +2,7 @@
window.Ewin = function () {
var html = '<div id="[Id]" class="modal fade" role="dialog" aria-labelledby="modalLabel">' +
'<div class="modal-dialog modal-sm">' +
'<div class="modal-dialog modal-lg">' +
'<div class="modal-content">' +
'<div class="modal-header">' +
'<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>' +
......
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ 662ee90a
......@@ -107,8 +107,8 @@
"CertificationResult": "Certification Result",
"Change": "Change",
"Alter": "Alter",
"MenuRecordManage": "Record Manage",
"MenuAnalysis": "Analysis",
"MenuRecordManage": "Document Management",
"MenuAnalysis": "Tax Analysis",
"ChangePassword": "Change Password",
"ChangePasswordFailInfo": "Failed Password Modification Operation:",
"ChangePasswordSuccessInfo": "The Password Modification Operation was Successful! Automatic Shutdown After 3 Seconds...",
......
atms-web/src/main/webapp/app/cit/cit-layout/cit-layout.ctrl.js
View file @ 662ee90a
......@@ -591,7 +591,7 @@ citModule.controller('citLayoutController', ['$scope', '$rootScope', '$location'
function initStatus(dbName, id, month) {
$q.all([
projectService.getProjectStatus(dbName, id, month),
vatWorkflowService.getWorkflowDetailByDb(dbName, month)
// vatWorkflowService.getWorkflowDetailByDb(dbName, month)
]).then(function (result) {
var statusData = result[0].data;
var workflowData = result[1].data;
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 662ee90a
......@@ -305,6 +305,26 @@
color: #fff;
}
.TDL-pdf-preview-pop-rotateCw-btn {
position: fixed;
top: 12rem;
right: 6rem;
width: 4rem;
height: 4rem;
background: rgba(254, 66, 66, 0.5);
color: #333;
border-radius: 100%;
text-align: center;
line-height: 100%;
cursor: pointer;
padding: 0;
z-index: 1502;
border: 0;
}
.TDL-pdf-preview-pop-rotateCw-btn:hover{
background: rgba(254, 66, 66, 0.8);
color: #fff;
}
.TDL-pdf-layout-dialog {
display: none;
}
......@@ -1485,8 +1505,10 @@
<div class="wrapper TDL-pdf-preview-pop" id="pdfContainer">
<canvas id="the-canvas"></canvas>
</div>
<button class="TDL-pdf-preview-pop-close-btn" ng-click="closePdfPop()">×</button>
<button class="TDL-pdf-preview-pop-close-btn" title="关闭" ng-click="closePdfPop()">×</button>
<button class="TDL-pdf-preview-pop-rotateCw-btn" title="顺时针旋转" ng-click="webViewerRotateCw()">
<span class="glyphicon glyphicon-repeat"></span>
</button>
<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-prev" ng-click="prevPaging()" title="上一页">&lt;</button>
<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-next" ng-click="nextPaging()" title="下一页">&gt;</button>
</div>
......
atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
View file @ 662ee90a
......@@ -381,7 +381,7 @@
var year=now.getFullYear();
var vatMonth=vatSessionService.month;
if(vatSessionService.year==year){
if(vatMonth===month-1){
if(vatMonth===month||vatMonth===month-1){
return false;
}else{
return true;
......@@ -406,7 +406,7 @@
allowOutsideClick: false,
confirmButtonText: $translate.instant('Yes'),
cancelButtonText: $translate.instant('No'),
closeOnConfirm: true,
closeOnConfirm: false,
closeOnCancel: true
},
function (isConfirm) {
......@@ -430,8 +430,8 @@
var startCaculate2 = function () {
if (vatSessionService.project.projectStatusList[vatSessionService.month] >= constant.ProjectStatusEnum.Generated) {
swal({
if (vatSessionService.project.projectStatusList[vatSessionService.month] >= constant.ProjectStatusEnum.Generated) {
swal({
title: "warning!",
text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[vatSessionService.month])}),
type: "warning",
......@@ -478,6 +478,7 @@
}
else {
doStartCaculate2(false);
swal.close();
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment