Skip to content

T
traffic-front
Commit 5783d9e9 authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

fixed page issue -- frank

parent cba7426d
Hide whitespace changes
Inline Side-by-side
Showing with 861 additions and 1007 deletions
atms-api/pom.xml
View file @ 5783d9e9
...@@ -14,497 +14,506 @@ ...@@ -14,497 +14,506 @@
</parent> </parent>
<dependencies> <dependencies>
<!-- https://mvnrepository.com/artifact/com.oracle/ojdbc6 --> <!-- https://mvnrepository.com/artifact/com.oracle/ojdbc6 -->
<!--<dependency>--> <!--<dependency>-->
<!--<groupId>com.oracle</groupId>--> <!--<groupId>com.oracle</groupId>-->
<!--<artifactId>ojdbc</artifactId>--> <!--<artifactId>ojdbc</artifactId>-->
<!--<version>0.0.1</version>--> <!--<version>0.0.1</version>-->
<!--</dependency>--> <!--</dependency>-->
<!--<dependency> <!--<dependency>
<groupId>com.oracle</groupId> <groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId> <artifactId>ojdbc6</artifactId>
<version>12.1.0.1-atlassian-hosted</version> <version>12.1.0.1-atlassian-hosted</version>
</dependency>--> </dependency>-->
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient --> <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<!-- https://mvnrepository.com/artifact/commons-httpclient/commons-httpclient --> <!-- https://mvnrepository.com/artifact/commons-httpclient/commons-httpclient -->
<dependency> <dependency>
<groupId>commons-httpclient</groupId> <groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId> <artifactId>commons-httpclient</artifactId>
<version>3.1</version> <version>3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>pwc.taxtech.atms</groupId> <groupId>pwc.taxtech.atms</groupId>
<artifactId>atms-dao</artifactId> <artifactId>atms-dao</artifactId>
<version>0.1.1</version> <version>0.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-context-support</artifactId>
</dependency> </dependency>
<!--websocket--> <!--websocket-->
<dependency> <dependency>
<groupId>javax.websocket</groupId> <groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId> <artifactId>javax.websocket-api</artifactId>
<version>1.1</version> <version>1.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-websocket</artifactId> <artifactId>spring-websocket</artifactId>
<version>4.0.5.RELEASE</version> <version>4.0.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId> <artifactId>spring-webmvc</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId> <artifactId>spring-jdbc</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId> <artifactId>spring-aspects</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId> <artifactId>spring-security-config</artifactId>
<version>4.2.3.RELEASE</version> <version>4.2.3.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId> <artifactId>spring-security-taglibs</artifactId>
<version>4.2.3.RELEASE</version> <version>4.2.3.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId> <artifactId>spring-security-web</artifactId>
<version>4.2.3.RELEASE</version> <version>4.2.3.RELEASE</version>
</dependency> </dependency>
<!--去除swagger--> <!--去除swagger-->
<!-- <dependency> <!-- <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.8.0</version> <version>2.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.8.0</version> <version>2.8.0</version>
</dependency>--> </dependency>-->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId> <artifactId>jjwt</artifactId>
<version>0.9.0</version> <version>0.9.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.9.4</version> <version>2.9.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
<version>3.4.5</version> <version>3.4.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId> <artifactId>mybatis-spring</artifactId>
<version>1.3.1</version> <version>1.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
<version>1.3.3</version> <version>1.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.6</version> <version>2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version> <version>1.7.25</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.thymeleaf</groupId> <groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId> <artifactId>thymeleaf</artifactId>
<version>${thymeleaf.version}</version> <version>${thymeleaf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.thymeleaf</groupId> <groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring4</artifactId> <artifactId>thymeleaf-spring4</artifactId>
<version>${thymeleaf.version}</version> <version>${thymeleaf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.thymeleaf.extras</groupId> <groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity4</artifactId> <artifactId>thymeleaf-extras-springsecurity4</artifactId>
<version>3.0.2.RELEASE</version> <version>3.0.2.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>1.1.5</version> <version>1.1.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.nutz</groupId> <groupId>org.nutz</groupId>
<artifactId>nutz</artifactId> <artifactId>nutz</artifactId>
<version>1.r.63.r2</version> <version>1.r.63.r2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jstl</groupId> <groupId>jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>taglibs</groupId> <groupId>taglibs</groupId>
<artifactId>standard</artifactId> <artifactId>standard</artifactId>
<version>1.1.2</version> <version>1.1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.11</version> <version>1.11</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api --> <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson --> <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.40</version> <version>1.2.40</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
<version>2.9.9</version> <version>2.9.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jasypt</groupId> <groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId> <artifactId>jasypt</artifactId>
<version>1.9.2</version> <version>1.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jasypt</groupId> <groupId>org.jasypt</groupId>
<artifactId>jasypt-spring31</artifactId> <artifactId>jasypt-spring31</artifactId>
<version>1.9.2</version> <version>1.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.7</version> <version>3.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<version>3.2.2</version> <version>3.2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
<version>1.8.3</version> <version>1.8.3</version>
</dependency> </dependency>
<!-- https://github.com/monitorjbl/excel-streaming-reader --> <!-- https://github.com/monitorjbl/excel-streaming-reader -->
<!-- <dependency> <groupId>com.monitorjbl</groupId> <artifactId>xlsx-streamer</artifactId> <!-- <dependency> <groupId>com.monitorjbl</groupId> <artifactId>xlsx-streamer</artifactId>
<version>1.2.0</version> </dependency> --> <version>1.2.0</version> </dependency> -->
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId> <artifactId>poi</artifactId>
<version>3.17</version> <version>3.17</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
<version>3.17</version> <version>3.17</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId> <artifactId>commons-text</artifactId>
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId> <artifactId>commons-pool2</artifactId>
<version>2.5.0</version> <version>2.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-net</groupId> <groupId>commons-net</groupId>
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
<version>3.6</version> <version>3.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>2.8.47</version> <version>2.8.47</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<version>3.9.1</version> <!-- Stay on 1.7.1 to support Java 6 --> <version>3.9.1</version> <!-- Stay on 1.7.1 to support Java 6 -->
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>24.0-jre</version> <version>24.0-jre</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis.generator</groupId> <groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId> <artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.6</version> <version>1.3.6</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper --> <!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper -->
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId> <artifactId>pagehelper</artifactId>
<version>5.1.4</version> <version>5.1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId> <artifactId>ehcache</artifactId>
<version>2.10.5</version> <version>2.10.5</version>
</dependency> </dependency>
<!-- reflectasm --> <!-- reflectasm -->
<dependency> <dependency>
<groupId>com.esotericsoftware</groupId> <groupId>com.esotericsoftware</groupId>
<artifactId>reflectasm</artifactId> <artifactId>reflectasm</artifactId>
<version>1.11.7</version> <version>1.11.7</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient --> <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.5.5</version> <version>4.5.5</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime --> <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime -->
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId> <artifactId>httpmime</artifactId>
<version>4.5.5</version> <version>4.5.5</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcomponents-client --> <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcomponents-client -->
<!-- https://mvnrepository.com/artifact/org.springframework.data/spring-data-commons --> <!-- https://mvnrepository.com/artifact/org.springframework.data/spring-data-commons -->
<dependency> <dependency>
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId> <artifactId>spring-data-commons</artifactId>
<version>2.1.0.RELEASE</version> <version>2.1.0.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.activiti</groupId> <groupId>org.activiti</groupId>
<artifactId>activiti-engine</artifactId> <artifactId>activiti-engine</artifactId>
<version>${activiti.version}</version> <version>${activiti.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.activiti</groupId> <groupId>org.activiti</groupId>
<artifactId>activiti-spring</artifactId> <artifactId>activiti-spring</artifactId>
<version>${activiti.version}</version> <version>${activiti.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.activiti</groupId> <groupId>org.activiti</groupId>
<artifactId>activiti-rest</artifactId> <artifactId>activiti-rest</artifactId>
<version>${activiti.version}</version> <version>${activiti.version}</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.grapecity.documents/gcexcel --> <!-- https://mvnrepository.com/artifact/com.grapecity.documents/gcexcel -->
<dependency> <dependency>
<groupId>com.grapecity.documents</groupId> <groupId>com.grapecity.documents</groupId>
<artifactId>gcexcel</artifactId> <artifactId>gcexcel</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId> <artifactId>pdfbox</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox --> <!-- https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox -->
<dependency> <dependency>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId> <artifactId>pdfbox</artifactId>
<version>2.0.12</version> <version>2.0.12</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.quartz-scheduler/quartz --> <!-- https://mvnrepository.com/artifact/org.quartz-scheduler/quartz -->
<dependency> <dependency>
<groupId>org.quartz-scheduler</groupId> <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId> <artifactId>quartz</artifactId>
<version>2.3.0</version> <version>2.3.0</version>
</dependency> </dependency>
<!--接口调用--> <!--接口调用-->
<dependency> <dependency>
<groupId>pwc.tax</groupId> <groupId>pwc.tax</groupId>
<artifactId>soap-client</artifactId> <artifactId>soap-client</artifactId>
<version>1.0</version> <version>1.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/lib/soap-client-1.0.jar</systemPath> <systemPath>${basedir}/lib/soap-client-1.0.jar</systemPath>
</dependency> </dependency>
<!--CXF--> <!--CXF-->
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId> <artifactId>cxf-core</artifactId>
<version>3.2.6</version> <version>3.2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId> <artifactId>cxf-rt-wsdl</artifactId>
<version>3.2.6</version> <version>3.2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId> <artifactId>cxf-rt-bindings-soap</artifactId>
<version>3.2.6</version> <version>3.2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId> <artifactId>cxf-rt-databinding-jaxb</artifactId>
<version>3.2.6</version> <version>3.2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId> <artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>3.2.6</version> <version>3.2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId> <artifactId>cxf-rt-transports-http</artifactId>
<version>3.2.6</version> <version>3.2.6</version>
</dependency> </dependency>
<!--CXF END--> <!--CXF END-->
<!-- https://mvnrepository.com/artifact/org.jxls/jxls --> <!-- https://mvnrepository.com/artifact/org.jxls/jxls -->
<dependency> <dependency>
<groupId>org.jxls</groupId> <groupId>org.jxls</groupId>
<artifactId>jxls</artifactId> <artifactId>jxls</artifactId>
<version>2.4.5</version> <version>2.4.5</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.jxls/jxls-poi --> <!-- https://mvnrepository.com/artifact/org.jxls/jxls-poi -->
<dependency> <dependency>
<groupId>org.jxls</groupId> <groupId>org.jxls</groupId>
<artifactId>jxls-poi</artifactId> <artifactId>jxls-poi</artifactId>
<version>1.0.15</version> <version>1.0.15</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/net.sf.jxls/jxls-core --> <!-- https://mvnrepository.com/artifact/net.sf.jxls/jxls-core -->
<dependency> <dependency>
<groupId>net.sf.jxls</groupId> <groupId>net.sf.jxls</groupId>
<artifactId>jxls-core</artifactId> <artifactId>jxls-core</artifactId>
<version>1.0.6</version> <version>1.0.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
<version>1.0.0.GA</version> <version>1.0.0.GA</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.0</version> <version>1.18.0</version>
</dependency> </dependency>
<!--PDF转换为图片--> <!--PDF转换为图片-->
<dependency> <dependency>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId> <artifactId>fontbox</artifactId>
<version>2.0.1</version> <version>2.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId> <artifactId>pdfbox</artifactId>
<version>2.0.1</version> <version>2.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<version>4.3.1.Final</version> <version>4.3.1.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
<version>1.1.0.Final</version> <version>1.1.0.Final</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.8</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>
<profile> <profile>
<id>dev</id> <id>dev</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<filters>
<filter>src/main/resources/conf/conf_profile_dev.properties</filter>
</filters>
</build>
<properties>
<env>dev</env>
</properties>
</profile>
<!-- <profile>
<id>local</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<build> <build>
<filters> <filters>
<filter>src/main/resources/conf/conf_profile_dev_local.properties</filter> <filter>src/main/resources/conf/conf_profile_dev.properties</filter>
</filters> </filters>
</build> </build>
<properties> <properties>
<env>local</env> <env>dev</env>
</properties> </properties>
</profile>--> </profile>
<!-- <profile>
<id>local</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<filters>
<filter>src/main/resources/conf/conf_profile_dev_local.properties</filter>
</filters>
</build>
<properties>
<env>local</env>
</properties>
</profile>-->
<profile> <profile>
<id>staging</id> <id>staging</id>
<build> <build>
......
atms-api/src/main/java/pwc/taxtech/atms/common/POIUtil.java
View file @ 5783d9e9
...@@ -45,7 +45,7 @@ public class POIUtil { ...@@ -45,7 +45,7 @@ public class POIUtil {
} }
Row targetRow = targetSheet.createRow(r); Row targetRow = targetSheet.createRow(r);
for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) { for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
if(c < 0 ){ if (c < 0) {
continue; continue;
} }
Cell cell = row.getCell(c); Cell cell = row.getCell(c);
...@@ -76,10 +76,10 @@ public class POIUtil { ...@@ -76,10 +76,10 @@ public class POIUtil {
if (null != cell.getCellComment()) { if (null != cell.getCellComment()) {
targetCell.setCellComment(cell.getCellComment()); targetCell.setCellComment(cell.getCellComment());
} }
if (null != cell.getCellStyle() && targetCell.getCellStyle() != null ) { if (null != cell.getCellStyle() && targetCell.getCellStyle() != null) {
try{ try {
targetCell.getCellStyle().cloneStyleFrom(cell.getCellStyle()); targetCell.getCellStyle().cloneStyleFrom(cell.getCellStyle());
}catch (Exception e){ } catch (Exception e) {
//e.printStackTrace(); //e.printStackTrace();
} }
} }
...@@ -90,11 +90,11 @@ public class POIUtil { ...@@ -90,11 +90,11 @@ public class POIUtil {
} }
} }
public static void cloneSheetAndStyle(Sheet sheet, Sheet targetSheet,Workbook tWorkbook) { public static void cloneSheetAndStyle(Sheet sheet, Sheet targetSheet, Workbook tWorkbook) {
//设置合并单元格 //设置合并单元格
List<CellRangeAddress> merges = sheet.getMergedRegions(); List<CellRangeAddress> merges = sheet.getMergedRegions();
if(CollectionUtils.isNotEmpty(merges)){ if (CollectionUtils.isNotEmpty(merges)) {
for(CellRangeAddress merge : merges){ for (CellRangeAddress merge : merges) {
targetSheet.addMergedRegion(merge); targetSheet.addMergedRegion(merge);
} }
} }
...@@ -105,7 +105,7 @@ public class POIUtil { ...@@ -105,7 +105,7 @@ public class POIUtil {
} }
Row targetRow = targetSheet.createRow(r); Row targetRow = targetSheet.createRow(r);
for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) { for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
if(c < 0 ){ if (c < 0) {
continue; continue;
} }
Cell cell = row.getCell(c); Cell cell = row.getCell(c);
...@@ -116,9 +116,9 @@ public class POIUtil { ...@@ -116,9 +116,9 @@ public class POIUtil {
targetCell.setCellType(cell.getCellTypeEnum()); targetCell.setCellType(cell.getCellTypeEnum());
switch (cell.getCellTypeEnum()) { switch (cell.getCellTypeEnum()) {
case STRING: case STRING:
if (cell.getStringCellValue().indexOf("KeyIn")>0){ if (cell.getStringCellValue().indexOf("KeyIn") > 0) {
targetCell.setCellValue(""); targetCell.setCellValue("");
}else{ } else {
targetCell.setCellValue(cell.getStringCellValue()); targetCell.setCellValue(cell.getStringCellValue());
} }
break; break;
...@@ -141,11 +141,11 @@ public class POIUtil { ...@@ -141,11 +141,11 @@ public class POIUtil {
targetCell.setCellComment(cell.getCellComment()); targetCell.setCellComment(cell.getCellComment());
} }
if (null != cell.getCellStyle()) { if (null != cell.getCellStyle()) {
CellStyle newstyle=tWorkbook.createCellStyle(); CellStyle newstyle = tWorkbook.createCellStyle();
targetCell.setCellStyle(newstyle); targetCell.setCellStyle(newstyle);
try{ try {
targetCell.getCellStyle().cloneStyleFrom(cell.getCellStyle()); targetCell.getCellStyle().cloneStyleFrom(cell.getCellStyle());
}catch (Exception e){ } catch (Exception e) {
//e.printStackTrace(); //e.printStackTrace();
} }
} }
...@@ -155,6 +155,7 @@ public class POIUtil { ...@@ -155,6 +155,7 @@ public class POIUtil {
} }
} }
} }
public static String getCellFormulaString(Cell cell) { public static String getCellFormulaString(Cell cell) {
switch (cell.getCellTypeEnum()) { switch (cell.getCellTypeEnum()) {
case STRING: case STRING:
...@@ -192,14 +193,14 @@ public class POIUtil { ...@@ -192,14 +193,14 @@ public class POIUtil {
return row; return row;
} }
public static Row createAndCloneRow(Workbook wb , Sheet sheet, Integer destRowIndex, Row fromRow) { public static Row createAndCloneRow(Workbook wb, Sheet sheet, Integer destRowIndex, Row fromRow) {
Row toRow = null; Row toRow = null;
if (sheet.getRow(destRowIndex) != null) { if (sheet.getRow(destRowIndex) != null) {
int lastRowNo = sheet.getLastRowNum(); int lastRowNo = sheet.getLastRowNum();
sheet.shiftRows(destRowIndex, lastRowNo, 1); sheet.shiftRows(destRowIndex, lastRowNo, 1);
} }
toRow = sheet.createRow(destRowIndex); toRow = sheet.createRow(destRowIndex);
for (Iterator cellIt = fromRow.cellIterator(); cellIt.hasNext();) { for (Iterator cellIt = fromRow.cellIterator(); cellIt.hasNext(); ) {
Cell tmpCell = (Cell) cellIt.next(); Cell tmpCell = (Cell) cellIt.next();
Cell newCell = toRow.createCell(tmpCell.getColumnIndex()); Cell newCell = toRow.createCell(tmpCell.getColumnIndex());
copyCell(wb, tmpCell, newCell, false); copyCell(wb, tmpCell, newCell, false);
...@@ -207,9 +208,9 @@ public class POIUtil { ...@@ -207,9 +208,9 @@ public class POIUtil {
return toRow; return toRow;
} }
public static void copyCell(Workbook wb,Cell srcCell, Cell distCell, public static void copyCell(Workbook wb, Cell srcCell, Cell distCell,
boolean copyValueFlag) { boolean copyValueFlag) {
CellStyle newstyle=wb.createCellStyle(); CellStyle newstyle = wb.createCellStyle();
newstyle.cloneStyleFrom(srcCell.getCellStyle()); newstyle.cloneStyleFrom(srcCell.getCellStyle());
// copyCellStyle(wb,srcCell.getCellStyle(), newstyle); // copyCellStyle(wb,srcCell.getCellStyle(), newstyle);
// distCell.setEncoding(srcCell.getEncoding()); // distCell.setEncoding(srcCell.getEncoding());
...@@ -244,7 +245,7 @@ public class POIUtil { ...@@ -244,7 +245,7 @@ public class POIUtil {
} }
} }
public static void copyCellStyle(Workbook wb,CellStyle fromStyle, public static void copyCellStyle(Workbook wb, CellStyle fromStyle,
CellStyle toStyle) { CellStyle toStyle) {
toStyle.setAlignment(HorizontalAlignment.forInt(fromStyle.getAlignment())); toStyle.setAlignment(HorizontalAlignment.forInt(fromStyle.getAlignment()));
//边框和边框颜色 //边框和边框颜色
...@@ -263,7 +264,7 @@ public class POIUtil { ...@@ -263,7 +264,7 @@ public class POIUtil {
// //
toStyle.setDataFormat(fromStyle.getDataFormat()); toStyle.setDataFormat(fromStyle.getDataFormat());
toStyle.setFillPattern(FillPatternType.forInt(fromStyle.getFillPattern())); toStyle.setFillPattern(FillPatternType.forInt(fromStyle.getFillPattern()));
toStyle.setFont(wb.getFontAt(fromStyle.getFontIndex())); toStyle.setFont(wb.getFontAt(fromStyle.getFontIndex()));
toStyle.setHidden(fromStyle.getHidden()); toStyle.setHidden(fromStyle.getHidden());
toStyle.setIndention(fromStyle.getIndention());//首行缩进 toStyle.setIndention(fromStyle.getIndention());//首行缩进
toStyle.setLocked(fromStyle.getLocked()); toStyle.setLocked(fromStyle.getLocked());
......
atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
View file @ 5783d9e9
...@@ -12,10 +12,6 @@ import pwc.taxtech.atms.service.impl.DistributedIdService; ...@@ -12,10 +12,6 @@ import pwc.taxtech.atms.service.impl.DistributedIdService;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
//import pwc.taxtech.atms.invoice.InputInvoiceMapper;
//import pwc.taxtech.atms.invoice.OutputInvoiceDetailMapper;
//import pwc.taxtech.atms.invoice.OutputInvoiceMapper;
//import pwc.taxtech.atms.service.impl.DidiFileUploadService;
//用来获取spring托管的bean //用来获取spring托管的bean
@Component @Component
...@@ -23,64 +19,9 @@ public class SpringContextUtil implements ApplicationContextAware { ...@@ -23,64 +19,9 @@ public class SpringContextUtil implements ApplicationContextAware {
private static ApplicationContext webApplicationContext; private static ApplicationContext webApplicationContext;
// public static FormulaAdminMapper formulaAdminMapper;
// public static PeriodReportMapper reportMapper;
// public static CellDataMapper cellDataMapper;
// public static PeriodCellDataMapper periodCellDataMapper;
public static DistributedIdService distributedIdService; public static DistributedIdService distributedIdService;
// public static PeriodFormulaBlockMapper formulaBlockMapper;
// public static PeriodCellTemplateMapper periodCellTemplateMapper;
// public static ProjectServiceTypeMapper projectServiceTypeMapper;
// public static PeriodTemplateMapper periodTemplateMapper;
// public static PeriodStandardAccountMapper periodStandardAccountMapper;
// public static ProjectDao projectDao;
// public static GlBalanceMapper glBalanceMapper;
// public static BalanceMapper balanceMapper;
// public static DataSourceMapper dataSourceMapper;
// public static PeriodDataSourceMapper periodDataSourceMapper;
// public static DataSourceDetailMapper dataSourceDetailMapper;
// public static PeriodDataSourceDetailMapper periodDataSourceDetailMapper;
// public static PeriodFormulaBlockMapper periodFormulaBlockMapper;
// public static VatEnterpriseAccountDao vatEnterpriseAccountDao;
// public static VatEnterpriseAccountMapper vatEnterpriseAccountMapper;
// public static PeriodEnterpriseAccountMapper periodEnterpriseAccountMapper;
// public static BalanceStdManualMapper balanceStdManualMapper;
// public static OutputInvoiceMapper outputInvoiceMapper;
// public static OutputInvoiceDetailMapper outputInvoiceDetailMapper;
// public static PeriodTaxRuleSettingMapper periodTaxRuleSettingMapper;
// public static InputInvoiceDao inputInvoiceDao;
// public static InputInvoiceMapper inputInvoiceMapper;
// public static InputVatInvoiceMapper inputVatInvoiceMapper;
// public static CitAssetsListMapper assetsListMapper;
// public static ProjectMapper projectMapper;
// public static CellDataSourceMapper cellDataSourceMapper;
// public static PeriodCellDataSourceMapper periodCellDataSourceMapper;
public static OrganizationMapper organizationMapper; public static OrganizationMapper organizationMapper;
// public static EnterpriseAccountSetOrgMapper enterpriseAccountSetOrgMapper;
// public static AccountMappingMapper accountMappingMapper;
// public static TrialBalanceMapper trialBalanceMapper;
// public static AdjustmentTableMapper adjustmentTableMapper;
// public static TrialBalanceFinalMapper trialBalanceFinalMapper;
// public static ProfitLossStatementMapper profitLossStatementMapper;
// public static RevenueConfigMapper revenueConfigMapper;
// public static RevenueTypeMappingMapper revenueTypeMappingMapper;
// public static InvoiceRecordMapper invoiceRecordMapper;
// public static CertifiedInvoicesListMapper certifiedInvoicesListMapper;
// public static TrialBalanceMappingMapper trialBalanceMappingMapper;
public static UserMapper userMapper; public static UserMapper userMapper;
// public static InteractionInteractiveSystemMapper interactionInteractiveSystemMapper;
// public static PwcTaskMapper pwcTaskMapper;
//
// public static CashFlowMapper cashFlowMapper;
// public static BalanceSheetManualMapper balanceSheetManualMapper;
// public static ProfitLossStatementManualMapper profitLossStatementManualMapper;
// public static CashFlowManualMapper cashFlowManualMapper;
// public static BalanceSheetFinalMapper balanceSheetFinalMapper;
// public static CashFlowFinalMapper cashFlowFinalMapper;
// public static CitBalanceSheetPrcAdjustMapper citBalanceSheetPrcAdjustMapper;
// public static CitProfitPrcAdjustMapper citProfitPrcAdjustMapper;
// public static BalanceSheetMapper balanceSheetMapper;
// public static DidiFileUploadService didiFileUploadService;
public static Map map = new HashMap<String, Object>(); public static Map map = new HashMap<String, Object>();
public static SqlSessionFactory sqlSessionFactory; public static SqlSessionFactory sqlSessionFactory;
...@@ -98,83 +39,8 @@ public class SpringContextUtil implements ApplicationContextAware { ...@@ -98,83 +39,8 @@ public class SpringContextUtil implements ApplicationContextAware {
@Override @Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
webApplicationContext = applicationContext; webApplicationContext = applicationContext;
// formulaAdminMapper = webApplicationContext.getBean(FormulaAdminMapper.class);
// reportMapper = webApplicationContext.getBean(PeriodReportMapper.class);
// cellDataMapper = webApplicationContext.getBean(CellDataMapper.class);
// periodCellDataMapper = webApplicationContext.getBean(PeriodCellDataMapper.class);
distributedIdService = webApplicationContext.getBean(DistributedIdService.class); distributedIdService = webApplicationContext.getBean(DistributedIdService.class);
// formulaBlockMapper = webApplicationContext.getBean(PeriodFormulaBlockMapper.class);
// periodCellTemplateMapper = webApplicationContext.getBean(PeriodCellTemplateMapper.class);
// projectServiceTypeMapper = webApplicationContext.getBean(ProjectServiceTypeMapper.class);
// periodTemplateMapper = webApplicationContext.getBean(PeriodTemplateMapper.class);
//// periodStandardAccountMapper = webApplicationContext.getBean(PeriodStandardAccountMapper.class);
// periodStandardAccountMapper = webApplicationContext.getBean(PeriodStandardAccountMapper.class);
// projectDao = webApplicationContext.getBean(ProjectDao.class);
// balanceMapper = webApplicationContext.getBean(BalanceMapper.class);
//// dataSourceMapper = webApplicationContext.getBean(DataSourceMapper.class);
// periodDataSourceMapper = webApplicationContext.getBean(PeriodDataSourceMapper.class);
//// dataSourceDetailMapper = webApplicationContext.getBean(DataSourceDetailMapper.class);
// periodDataSourceDetailMapper = webApplicationContext.getBean(PeriodDataSourceDetailMapper.class);
// periodFormulaBlockMapper = webApplicationContext.getBean(PeriodFormulaBlockMapper.class);
// vatEnterpriseAccountDao = webApplicationContext.getBean(VatEnterpriseAccountDao.class);
// vatEnterpriseAccountMapper = webApplicationContext.getBean(VatEnterpriseAccountMapper.class);
// periodEnterpriseAccountMapper = webApplicationContext.getBean(PeriodEnterpriseAccountMapper.class);
// balanceStdManualMapper = webApplicationContext.getBean(BalanceStdManualMapper.class);
//// outputVatInvoiceMapper = webApplicationContext.getBean(OutputVatInvoiceMapper.class);
// outputInvoiceMapper = webApplicationContext.getBean(OutputInvoiceMapper.class);
// outputInvoiceDetailMapper = webApplicationContext.getBean(OutputInvoiceDetailMapper.class);
// periodTaxRuleSettingMapper = webApplicationContext.getBean(PeriodTaxRuleSettingMapper.class);
// inputVatInvoiceDao = webApplicationContext.getBean(InputVatInvoiceDao.class);
// inputVatInvoiceMapper = webApplicationContext.getBean(InputVatInvoiceMapper.class);
// inputInvoiceDao = webApplicationContext.getBean(InputInvoiceDao.class);
// inputInvoiceMapper = webApplicationContext.getBean(InputInvoiceMapper.class);
// assetsListMapper = webApplicationContext.getBean(CitAssetsListMapper.class);
// projectMapper = webApplicationContext.getBean(ProjectMapper.class);
// cellDataSourceMapper = webApplicationContext.getBean(CellDataSourceMapper.class);
// periodCellDataSourceMapper = webApplicationContext.getBean(PeriodCellDataSourceMapper.class);
// organizationMapper = webApplicationContext.getBean(OrganizationMapper.class);
// enterpriseAccountSetOrgMapper = webApplicationContext.getBean(EnterpriseAccountSetOrgMapper.class);
// accountMappingMapper = webApplicationContext.getBean(AccountMappingMapper.class);
// glBalanceMapper = webApplicationContext.getBean(GlBalanceMapper.class);
// trialBalanceMapper = webApplicationContext.getBean(TrialBalanceMapper.class);
// adjustmentTableMapper = webApplicationContext.getBean(AdjustmentTableMapper.class);
// trialBalanceFinalMapper = webApplicationContext.getBean(TrialBalanceFinalMapper.class);
// profitLossStatementMapper = webApplicationContext.getBean(ProfitLossStatementMapper.class);
// cashFlowMapper = webApplicationContext.getBean(CashFlowMapper.class);
// balanceSheetManualMapper = webApplicationContext.getBean(BalanceSheetManualMapper.class);
// profitLossStatementManualMapper = webApplicationContext.getBean(ProfitLossStatementManualMapper.class);
// cashFlowManualMapper = webApplicationContext.getBean(CashFlowManualMapper.class);
// balanceSheetFinalMapper = webApplicationContext.getBean(BalanceSheetFinalMapper.class);
// cashFlowFinalMapper = webApplicationContext.getBean(CashFlowFinalMapper.class);
// citBalanceSheetPrcAdjustMapper = webApplicationContext.getBean(CitBalanceSheetPrcAdjustMapper.class);
//
// citProfitPrcAdjustMapper = webApplicationContext.getBean(CitProfitPrcAdjustMapper.class);
// balanceSheetMapper = webApplicationContext.getBean(BalanceSheetMapper.class);
// revenueTypeMappingMapper = webApplicationContext.getBean(RevenueTypeMappingMapper.class);
// invoiceRecordMapper = webApplicationContext.getBean(InvoiceRecordMapper.class);
// certifiedInvoicesListMapper = webApplicationContext.getBean(CertifiedInvoicesListMapper.class);
// trialBalanceMappingMapper = webApplicationContext.getBean(TrialBalanceMappingMapper.class);
// revenueConfigMapper = webApplicationContext.getBean(RevenueConfigMapper.class);
// didiFileUploadService = webApplicationContext.getBean(DidiFileUploadService.class);
userMapper = webApplicationContext.getBean(UserMapper.class); userMapper = webApplicationContext.getBean(UserMapper.class);
// interactionInteractiveSystemMapper = webApplicationContext.getBean(InteractionInteractiveSystemMapper.class);
// pwcTaskMapper = webApplicationContext.getBean(PwcTaskMapper.class);
sqlSessionFactory = webApplicationContext.getBean(SqlSessionFactory.class); sqlSessionFactory = webApplicationContext.getBean(SqlSessionFactory.class);
/* map.put("balance_sheet", balanceMapper);
map.put("profit_loss_statement",profitLossStatementMapper);
map.put("cash_flow", cashFlowMapper);
map.put("balance_sheet_manual", balanceSheetManualMapper);
map.put("profit_loss_statement_manual", profitLossStatementManualMapper);
map.put("cash_flow_manual", cashFlowManualMapper);
map.put("balance_sheet_final", balanceSheetFinalMapper);
map.put("profit_loss_statement_final", profitLossStatementManualMapper);
map.put("cash_flow_final", cashFlowFinalMapper);
map.put("cit_balance_sheet_prc_adjust", citBalanceSheetPrcAdjustMapper);
map.put("cit_profit_prc_adjust", citProfitPrcAdjustMapper);*/
} }
} }
atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationHKController.java
View file @ 5783d9e9
...@@ -7,7 +7,9 @@ import org.springframework.web.bind.annotation.*; ...@@ -7,7 +7,9 @@ import org.springframework.web.bind.annotation.*;
import pwc.taxtech.atms.dto.OperationResultDto; import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.navtree.NavTreeDto; import pwc.taxtech.atms.dto.navtree.NavTreeDto;
import pwc.taxtech.atms.organization.dpo.OrganizationHKDto; import pwc.taxtech.atms.organization.dpo.OrganizationHKDto;
import pwc.taxtech.atms.organization.entity.OrganizationDirector;
import pwc.taxtech.atms.organization.entity.OrganizationHK; import pwc.taxtech.atms.organization.entity.OrganizationHK;
import pwc.taxtech.atms.organization.entity.OrganizationShareholder;
import pwc.taxtech.atms.service.impl.OrganizationHKServiceImpl; import pwc.taxtech.atms.service.impl.OrganizationHKServiceImpl;
import java.util.List; import java.util.List;
...@@ -69,4 +71,32 @@ public class OrganizationHKController { ...@@ -69,4 +71,32 @@ public class OrganizationHKController {
logger.info("POST /api/v1/orgHK/add"); logger.info("POST /api/v1/orgHK/add");
return organizationHKService.addOrg(orgDto); return organizationHKService.addOrg(orgDto);
} }
@RequestMapping(value = "addDirecotr", method = RequestMethod.POST)
public @ResponseBody
OperationResultDto<Object> addDirector(@RequestBody OrganizationDirector organizationDirector) {
logger.info("POST /api/v1/orgHK/addDirecotr");
return organizationHKService.addOrgDirector(organizationDirector);
}
@RequestMapping(value = "addShareholder", method = RequestMethod.POST)
public @ResponseBody
OperationResultDto<Object> addShareholder(@RequestBody OrganizationShareholder organizationShareholder) {
logger.info("POST /api/v1/orgHK/addShareholder");
return organizationHKService.addOrgShareholder(organizationShareholder);
}
@RequestMapping(value = "updateDirector", method = RequestMethod.PUT)
public @ResponseBody
OperationResultDto<Object> updateDirector(@RequestBody OrganizationDirector organizationDirector) {
logger.info("PUT /api/v1/orgHK/updateDirector");
return organizationHKService.updateDirector(organizationDirector);
}
@RequestMapping(value = "updateShareholder", method = RequestMethod.PUT)
public @ResponseBody
OperationResultDto<Object> updateShareholder(@RequestBody OrganizationShareholder organizationShareholder) {
logger.info("PUT /api/v1/orgHK/updateShareholder");
return organizationHKService.updateShareholder(organizationShareholder);
}
} }
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationHKServiceImpl.java
View file @ 5783d9e9
...@@ -12,16 +12,19 @@ import pwc.taxtech.atms.common.*; ...@@ -12,16 +12,19 @@ import pwc.taxtech.atms.common.*;
import pwc.taxtech.atms.common.message.LogMessage; import pwc.taxtech.atms.common.message.LogMessage;
import pwc.taxtech.atms.common.message.OrganizationMessage; import pwc.taxtech.atms.common.message.OrganizationMessage;
import pwc.taxtech.atms.common.util.BeanUtil; import pwc.taxtech.atms.common.util.BeanUtil;
import pwc.taxtech.atms.constant.OrganizationConstant;
import pwc.taxtech.atms.dto.OperationLogDto; import pwc.taxtech.atms.dto.OperationLogDto;
import pwc.taxtech.atms.dto.OperationResultDto; import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.UpdateLogParams; import pwc.taxtech.atms.dto.UpdateLogParams;
import pwc.taxtech.atms.dto.navtree.NavTreeDto; import pwc.taxtech.atms.dto.navtree.NavTreeDto;
import pwc.taxtech.atms.entity.ServiceType; import pwc.taxtech.atms.entity.ServiceType;
import pwc.taxtech.atms.organization.dao.OrganizationDirectorMapper;
import pwc.taxtech.atms.organization.dao.OrganizationHKMapper; import pwc.taxtech.atms.organization.dao.OrganizationHKMapper;
import pwc.taxtech.atms.organization.dao.OrganizationShareholderMapper;
import pwc.taxtech.atms.organization.dpo.OrganizationHKDto; import pwc.taxtech.atms.organization.dpo.OrganizationHKDto;
import pwc.taxtech.atms.organization.entity.OrganizationDirector;
import pwc.taxtech.atms.organization.entity.OrganizationHK; import pwc.taxtech.atms.organization.entity.OrganizationHK;
import pwc.taxtech.atms.organization.entity.OrganizationHKExample; import pwc.taxtech.atms.organization.entity.OrganizationHKExample;
import pwc.taxtech.atms.organization.entity.OrganizationShareholder;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
...@@ -40,9 +43,18 @@ public class OrganizationHKServiceImpl { ...@@ -40,9 +43,18 @@ public class OrganizationHKServiceImpl {
@Resource @Resource
private OrganizationHKMapper organizationHKMapper; private OrganizationHKMapper organizationHKMapper;
@Resource
private OrganizationDirectorMapper organizationDirectorMapper;
@Resource
private OrganizationShareholderMapper organizationShareholderMapper;
@Autowired @Autowired
private OperationLogServiceImpl operationLogService; private OperationLogServiceImpl operationLogService;
@Autowired
private AuthUserHelper authUserHelper;
@Autowired @Autowired
private BeanUtil beanUtil; private BeanUtil beanUtil;
...@@ -149,7 +161,7 @@ public class OrganizationHKServiceImpl { ...@@ -149,7 +161,7 @@ public class OrganizationHKServiceImpl {
return orgList.stream().map(this::rotateOrganizationDtoToNavTreeDto).collect(Collectors.toList()); return orgList.stream().map(this::rotateOrganizationDtoToNavTreeDto).collect(Collectors.toList());
} }
public List<OrganizationHKDto> getOrgList(Integer useType) { private List<OrganizationHKDto> getOrgList(Integer useType) {
List<OrganizationHKDto> orgDtoList = new ArrayList<>(); List<OrganizationHKDto> orgDtoList = new ArrayList<>();
List<OrganizationHK> orgList = findAllOrganizations(); List<OrganizationHK> orgList = findAllOrganizations();
if (!orgList.isEmpty()) { if (!orgList.isEmpty()) {
...@@ -214,7 +226,7 @@ public class OrganizationHKServiceImpl { ...@@ -214,7 +226,7 @@ public class OrganizationHKServiceImpl {
return parentOrg; return parentOrg;
} }
public List<OrganizationHK> findAllOrganizations() { private List<OrganizationHK> findAllOrganizations() {
OrganizationHKExample organizationExample = new OrganizationHKExample(); OrganizationHKExample organizationExample = new OrganizationHKExample();
return organizationHKMapper.selectByExample(organizationExample); return organizationHKMapper.selectByExample(organizationExample);
} }
...@@ -243,18 +255,34 @@ public class OrganizationHKServiceImpl { ...@@ -243,18 +255,34 @@ public class OrganizationHKServiceImpl {
if (result != null && !BooleanUtils.isTrue(result.getResult())) { if (result != null && !BooleanUtils.isTrue(result.getResult())) {
return new OperationResultDto(result.getResult(), result.getResultMsg()); return new OperationResultDto(result.getResult(), result.getResultMsg());
} }
if (Objects.equals(orgDto.getParentId(), OrganizationConstant.NoParentId)) { orgDto.setParentId(null);
orgDto.setParentId(null); orgDto.setPLevel(0);
orgDto.setpLevel(0);
} else {
}
orgDto.setId(distributedIdService.nextId()); orgDto.setId(distributedIdService.nextId());
Date now = new Date(); Date now = new Date();
OrganizationHK org = copyProperties(orgDto, new OrganizationHK()); OrganizationHK org = copyProperties(orgDto, new OrganizationHK());
org.setCreateTime(now); org.setCreateTime(now);
org.setUpdateTime(now); org.setUpdateTime(now);
if (orgDto.getDirectors() != null && orgDto.getDirectors().size() > 0) {
orgDto.getDirectors().forEach(a -> {
OrganizationDirector organizationDirector = beanUtil.copyProperties(a, new OrganizationDirector());
organizationDirector.setUpdateTime(now);
organizationDirector.setCreateTime(now);
organizationDirector.setEntityId(org.getId());
organizationDirector.setId(distributedIdService.nextId());
organizationDirectorMapper.insertSelective(organizationDirector);
});
}
if (orgDto.getShareholders() != null && orgDto.getShareholders().size() > 0) {
orgDto.getShareholders().forEach(a -> {
OrganizationShareholder organizationShareholder = beanUtil.copyProperties(a, new OrganizationShareholder());
organizationShareholder.setId(distributedIdService.nextId());
organizationShareholder.setInvestmentEntityId(0L);
organizationShareholder.setEntityId(org.getId());
organizationShareholder.setCreateTime(now);
organizationShareholder.setUpdateTime(now);
organizationShareholderMapper.insertSelective(organizationShareholder);
});
}
organizationHKMapper.insertSelective(org); organizationHKMapper.insertSelective(org);
UpdateLogParams tempCommonLogParms = new UpdateLogParams(); UpdateLogParams tempCommonLogParms = new UpdateLogParams();
...@@ -308,4 +336,60 @@ public class OrganizationHKServiceImpl { ...@@ -308,4 +336,60 @@ public class OrganizationHKServiceImpl {
} }
return new OperationResultDto(true); return new OperationResultDto(true);
} }
public OperationResultDto<Object> addOrgDirector(OrganizationDirector organizationDirector) {
OperationResultDto<Object> operationResultDto = new OperationResultDto<>();
organizationDirectorMapper.insertSelective(organizationDirector);
operationResultDto.setResult(true);
return operationResultDto;
}
public OperationResultDto<Object> addOrgShareholder(OrganizationShareholder organizationShareholder) {
OperationResultDto<Object> operationResultDto = new OperationResultDto<>();
organizationShareholderMapper.insertSelective(organizationShareholder);
operationResultDto.setResult(true);
return operationResultDto;
}
public OperationResultDto<Object> updateDirector(OrganizationDirector organizationDirector) {
OperationResultDto<Object> resultDto = new OperationResultDto<>();
if (existDirector(organizationDirector.getId())) {
Date now = new Date();
organizationDirector.setUpdateTime(now);
organizationDirector.setUpdateBy(authUserHelper.getCurrentUserId());
organizationDirectorMapper.updateByPrimaryKey(organizationDirector);
resultDto.setResult(true);
} else {
resultDto.setResult(false);
resultDto.setResultMsg("Not exist director");
}
return resultDto;
}
public OperationResultDto<Object> updateShareholder(OrganizationShareholder organizationShareholder) {
OperationResultDto<Object> resultDto = new OperationResultDto<>();
if (existShareholder(organizationShareholder.getId())) {
Date now = new Date();
organizationShareholder.setUpdateTime(now);
organizationShareholder.setUpdateBy(authUserHelper.getCurrentUserId());
organizationShareholderMapper.updateByPrimaryKey(organizationShareholder);
resultDto.setResult(true);
} else {
resultDto.setResult(false);
resultDto.setResultMsg("Not exist director");
}
return resultDto;
}
private boolean existShareholder(Long organizationShardholderId) {
OrganizationShareholder organizationShareholder = organizationShareholderMapper.selectByPrimaryKey(organizationShardholderId);
return organizationShareholder != null;
}
private boolean existDirector(Long organizationDirectorId) {
OrganizationDirector organizationDirector = organizationDirectorMapper.selectByPrimaryKey(organizationDirectorId);
return organizationDirector != null;
}
} }
atms-dao/pom.xml
View file @ 5783d9e9
...@@ -90,5 +90,13 @@ ...@@ -90,5 +90,13 @@
<classifier>jdk15</classifier> <classifier>jdk15</classifier>
</dependency> </dependency>
<!--Excel to Json End--> <!--Excel to Json End-->
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.8</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
atms-dao/src/main/java/pwc/taxtech/atms/organization/dpo/OrganizationDirectorDto.java 0 → 100644
View file @ 5783d9e9
package pwc.taxtech.atms.organization.dpo;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OrganizationDirectorDto {
String id;
String entityId;
String directorName;
String residency;
String dateOfAppointment;
String dateOfResignation;
String isExecutive;
String otherRoles;
String isDelete;
}
atms-dao/src/main/java/pwc/taxtech/atms/organization/dpo/OrganizationHKDto.java
View file @ 5783d9e9
package pwc.taxtech.atms.organization.dpo; package pwc.taxtech.atms.organization.dpo;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.util.List; import java.util.List;
@Getter
@Setter
@ToString
public class OrganizationHKDto { public class OrganizationHKDto {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
...@@ -38,284 +45,12 @@ public class OrganizationHKDto { ...@@ -38,284 +45,12 @@ public class OrganizationHKDto {
private String structureId; private String structureId;
private String industryId; private String industryId;
private String businessUnitId; private String businessUnitId;
private String parentName; private String parentName;
private List<OrganizationHKDto> subOrgs; private List<OrganizationHKDto> subOrgs;
private Integer pLevel; private Integer pLevel;
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
private Integer level; private Integer level;
@JsonProperty("directors")
public String getParentName() { private List<OrganizationDirectorDto> directors;
return parentName; @JsonProperty("shareholders")
} private List<OrganizationShareholderDto> shareholders;
public void setParentName(String parentName) {
this.parentName = parentName;
}
public List<OrganizationHKDto> getSubOrgs() {
return subOrgs;
}
public void setSubOrgs(List<OrganizationHKDto> subOrgs) {
this.subOrgs = subOrgs;
}
public Integer getpLevel() {
return pLevel;
}
public void setpLevel(Integer pLevel) {
this.pLevel = pLevel;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public Boolean getActive() {
return isActive;
}
public void setActive(Boolean active) {
isActive = active;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public String getLegalForm() {
return legalForm;
}
public void setLegalForm(String legalForm) {
this.legalForm = legalForm;
}
public String getRegisterAddress() {
return registerAddress;
}
public void setRegisterAddress(String registerAddress) {
this.registerAddress = registerAddress;
}
public Float getAuthorisedCapital() {
return authorisedCapital;
}
public void setAuthorisedCapital(Float authorisedCapital) {
this.authorisedCapital = authorisedCapital;
}
public Float getIssuedCapital() {
return issuedCapital;
}
public void setIssuedCapital(Float issuedCapital) {
this.issuedCapital = issuedCapital;
}
public String getIndustry() {
return industry;
}
public void setIndustry(String industry) {
this.industry = industry;
}
public String getPaymentOfAnnualGovernmentFee() {
return paymentOfAnnualGovernmentFee;
}
public void setPaymentOfAnnualGovernmentFee(String paymentOfAnnualGovernmentFee) {
this.paymentOfAnnualGovernmentFee = paymentOfAnnualGovernmentFee;
}
public String getAnnualReturnFillings() {
return annualReturnFillings;
}
public void setAnnualReturnFillings(String annualReturnFillings) {
this.annualReturnFillings = annualReturnFillings;
}
public String getBoardMeetingRequirement() {
return boardMeetingRequirement;
}
public void setBoardMeetingRequirement(String boardMeetingRequirement) {
this.boardMeetingRequirement = boardMeetingRequirement;
}
public String getBusinessLicense() {
return businessLicense;
}
public void setBusinessLicense(String businessLicense) {
this.businessLicense = businessLicense;
}
public String getRenewalOfBusinessLicense() {
return renewalOfBusinessLicense;
}
public void setRenewalOfBusinessLicense(String renewalOfBusinessLicense) {
this.renewalOfBusinessLicense = renewalOfBusinessLicense;
}
public String getEntityLevel() {
return entityLevel;
}
public void setEntityLevel(String entityLevel) {
this.entityLevel = entityLevel;
}
public String getDateOfIncorporation() {
return dateOfIncorporation;
}
public void setDateOfIncorporation(String dateOfIncorporation) {
this.dateOfIncorporation = dateOfIncorporation;
}
public String getJurisdictionOfFormation() {
return jurisdictionOfFormation;
}
public void setJurisdictionOfFormation(String jurisdictionOfFormation) {
this.jurisdictionOfFormation = jurisdictionOfFormation;
}
public String getFinancialYearEnd() {
return financialYearEnd;
}
public void setFinancialYearEnd(String financialYearEnd) {
this.financialYearEnd = financialYearEnd;
}
public String getAnnualAuditRequirement() {
return annualAuditRequirement;
}
public void setAnnualAuditRequirement(String annualAuditRequirement) {
this.annualAuditRequirement = annualAuditRequirement;
}
public String getRegisteredAgent() {
return registeredAgent;
}
public void setRegisteredAgent(String registeredAgent) {
this.registeredAgent = registeredAgent;
}
public String getOwnershipForm() {
return ownershipForm;
}
public void setOwnershipForm(String ownershipForm) {
this.ownershipForm = ownershipForm;
}
public String getResidentSecretary() {
return residentSecretary;
}
public void setResidentSecretary(String residentSecretary) {
this.residentSecretary = residentSecretary;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
public String getAreaId() {
return areaId;
}
public void setAreaId(String areaId) {
this.areaId = areaId;
}
public String getRegionId() {
return regionId;
}
public void setRegionId(String regionId) {
this.regionId = regionId;
}
public String getStructureId() {
return structureId;
}
public void setStructureId(String structureId) {
this.structureId = structureId;
}
public String getIndustryId() {
return industryId;
}
public void setIndustryId(String industryId) {
this.industryId = industryId;
}
public String getBusinessUnitId() {
return businessUnitId;
}
public void setBusinessUnitId(String businessUnitId) {
this.businessUnitId = businessUnitId;
}
} }
atms-dao/src/main/java/pwc/taxtech/atms/organization/dpo/OrganizationShareholderDto.java 0 → 100644
View file @ 5783d9e9
package pwc.taxtech.atms.organization.dpo;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class OrganizationShareholderDto {
String id;
String entityId;
String investmentEntityId;
String ownershipForm;
String commonPreferred;
String classOfShares;
String votingPercentage;
}
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ 5783d9e9
...@@ -387,8 +387,8 @@ ...@@ -387,8 +387,8 @@
<operate-log is-show="isShowLog"></operate-log> <operate-log is-show="isShowLog"></operate-log>
<edit-organization-modal is-show="showEditModal" parent-page=".system-manage" operate-type="orgOperateType" is-update="isOrgUpdate" <edit-organization-modal is-show="showEditModal" parent-page=".system-manage" operate-type="orgOperateType" is-update="isOrgUpdate"
selected-organization="selectedOrg" dimension-id="showAttributeDimensionID"></edit-organization-modal> selected-organization="selectedOrg" dimension-id="showAttributeDimensionID"></edit-organization-modal>
<edit-organization-shareholder-modal is-show-s="isShowShareholderModal2" parent-page=".system-manage" edit-model=""></edit-organization-shareholder-modal> <!--<edit-organization-shareholder-modal is-show-s="isShowShareholderModal2" parent-page=".system-manage" edit-model=""></edit-organization-shareholder-modal>-->
<edit-organization-director-modal is-show-d="isShowDirectorModal2" parent-page=".system-manage" edit-model=""></edit-organization-director-modal> <!--<edit-organization-director-modal is-show-d="isShowDirectorModal2" parent-page=".system-manage" edit-model=""></edit-organization-director-modal>-->
<!--<edit-equity-modal operate-type="equityEditOperateType" is-update="isEquityUpdate"--> <!--<edit-equity-modal operate-type="equityEditOperateType" is-update="isEquityUpdate"-->
<!--selected-organization="selectedOrg"></edit-equity-modal>--> <!--selected-organization="selectedOrg"></edit-equity-modal>-->
<!--<edit-equity-change-modal operate-type="equityChangeOperateType" is-update="isEquityChange"--> <!--<edit-equity-change-modal operate-type="equityChangeOperateType" is-update="isEquityChange"-->
......
atms-web/src/main/webapp/app/common/controls/edit-organization-director-modal/edit-organization-director-modal.ctrl.js
View file @ 5783d9e9
commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$log', 'ackUibModal', '$translate', function ($scope, $log, ackUibModal, $translate) { commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$log', 'ackUibModal', '$translate', 'orgHKService', function ($scope, $log, ackUibModal, $translate, orgHKService) {
'use strict'; 'use strict';
$scope.isShow = false;
//模态框管理 //模态框管理
$scope.modalManage = { $scope.modalManage = {
...@@ -16,16 +15,22 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -16,16 +15,22 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
$scope.modalInstance.open(); $scope.modalInstance.open();
}, },
close: function () { close: function () {
$scope.onClose();
$scope.modalInstance.close(); $scope.modalInstance.close();
}, },
cancel: function () { cancel: function () {
$scope.onClose(); $scope.onClose();
$scope.modalInstance.cancel(); $scope.modalInstance.cancel();
}, },
save:function () { save: function () {
var dxResult = DevExpress.validationEngine.validateGroup($('#directorControlForm').dxValidationGroup("instance")).isValid; var dxResult = DevExpress.validationEngine.validateGroup($('#directorControlForm').dxValidationGroup("instance")).isValid;
if (dxResult) { if (dxResult) {
if (!$scope.editModelD.id) {
$scope.editModelD.id = PWC.newGuid();
}
$scope.onSave({directorEntity: $scope.editModelD});
$scope.editModelD = {};
$scope.modalManage.directorModal.close();
} }
} }
} }
...@@ -34,19 +39,15 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -34,19 +39,15 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
var now = new Date(); var now = new Date();
var initParams = function () { var initParams = function () {
$scope.editModel = {};
$scope.dropdownDatasource = { $scope.dropdownDatasource = {
otherRolesTypeList: constant.organizationHK.OtherRoles, otherRolesTypeList: constant.organizationHK.OtherRoles,
executiveTypeList: constant.organizationHK.executiveType executiveTypeList: constant.organizationHK.executiveType
}; };
$scope.textOptions = { $scope.textOptions = {
directorNameOption: { directorNameOption: {
bindingOptions: { bindingOptions: {
value: 'editModel.directorName' value: 'editModelD.directorName'
}, },
maxLength: 100, maxLength: 100,
placeholder: $translate.instant('directorName'), placeholder: $translate.instant('directorName'),
...@@ -54,7 +55,7 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -54,7 +55,7 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
}, },
residencyOption: { residencyOption: {
bindingOptions: { bindingOptions: {
value: 'editModel.residency' value: 'editModelD.residency'
}, },
maxLength: 100, maxLength: 100,
placeholder: $translate.instant('residency'), placeholder: $translate.instant('residency'),
...@@ -62,7 +63,7 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -62,7 +63,7 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
}, },
dateOfAppointmentOption: { dateOfAppointmentOption: {
bindingOptions: { bindingOptions: {
value: 'editModel.dateOfAppointment' value: 'editModelD.dateOfAppointment'
}, },
type: "date", type: "date",
value: now, value: now,
...@@ -72,7 +73,7 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -72,7 +73,7 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
}, },
dateOfResignationOption: { dateOfResignationOption: {
bindingOptions: { bindingOptions: {
value: 'editModel.dateOfResignation' value: 'editModelD.dateOfResignation'
}, },
type: "date", type: "date",
value: now, value: now,
...@@ -83,10 +84,10 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -83,10 +84,10 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
executiveOption: { executiveOption: {
bindingOptions: { bindingOptions: {
dataSource: 'dropdownDatasource.executiveTypeList', dataSource: 'dropdownDatasource.executiveTypeList',
value: 'editModel.executive' value: 'editModelD.executive'
}, },
onSelectionChanged: function (args) { onSelectionChanged: function (args) {
$scope.editModel.executive = args.selectedItem.id; // $scope.editModel.executive = args.selectedItem.id;
}, },
itemTemplate: function (itemData, itemIndex, itemElement) { itemTemplate: function (itemData, itemIndex, itemElement) {
var span = $('<span title="' + itemData.name + '">').text(itemData.name); var span = $('<span title="' + itemData.name + '">').text(itemData.name);
...@@ -99,10 +100,10 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -99,10 +100,10 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
otherRolesOption: { otherRolesOption: {
bindingOptions: { bindingOptions: {
dataSource: 'dropdownDatasource.otherRolesTypeList', dataSource: 'dropdownDatasource.otherRolesTypeList',
value: 'editModel.otherRoles' value: 'editModelD.otherRoles'
}, },
onSelectionChanged: function (args) { onSelectionChanged: function (args) {
$scope.editModel.otherRoles = args.selectedItem.id; // $scope.editModel.otherRoles = args.selectedItem.id;
}, },
itemTemplate: function (itemData, itemIndex, itemElement) { itemTemplate: function (itemData, itemIndex, itemElement) {
var span = $('<span title="' + itemData.name + '">').text(itemData.name); var span = $('<span title="' + itemData.name + '">').text(itemData.name);
...@@ -172,14 +173,13 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -172,14 +173,13 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
var thisModuleService = { var thisModuleService = {
initEvents: function () { initEvents: function () {
$scope.save = function () {
};
}, },
initWatches: function () { initWatches: function () {
$scope.$watch('isShowD', function (newValue, oldValue) { $scope.$watch('isShowD', function (newValue) {
if (newValue) { if (newValue) {
console.log($scope.$parent.$parent.gModel.editDirectorModel);
$scope.editModelD= $scope.$parent.$parent.gModel.editDirectorModel;
$scope.modalManage.directorModal.open(); $scope.modalManage.directorModal.open();
} }
}); });
...@@ -188,6 +188,7 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -188,6 +188,7 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
(function initialize() { (function initialize() {
$log.debug('editOrganizationDirectorModalController.ctor()...'); $log.debug('editOrganizationDirectorModalController.ctor()...');
$scope.editModelD = {};
initParams(); initParams();
init(); init();
thisModuleService.initWatches(); thisModuleService.initWatches();
......
atms-web/src/main/webapp/app/common/controls/edit-organization-director-modal/edit-organization-director-modal.js
View file @ 5783d9e9
...@@ -8,9 +8,10 @@ commonModule.directive('editOrganizationDirectorModal', ['$log', function ($log) ...@@ -8,9 +8,10 @@ commonModule.directive('editOrganizationDirectorModal', ['$log', function ($log)
controller: 'editOrganizationDirectorModalController', controller: 'editOrganizationDirectorModalController',
scope: { scope: {
isShowD: '=?', isShowD: '=?',
editModelD: '=?',
parentPage: '@', parentPage: '@',
editModel: '=?', onClose:'&',
onClose:'&' onSave:'&'
}, },
link: function (scope, element) { link: function (scope, element) {
} }
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ 5783d9e9
commonModule.controller('editOrganizationModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', '$filter', 'SweetAlert', 'orgHKService', 'ackUibModal', commonModule.controller('editOrganizationModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', '$filter', 'SweetAlert', 'orgHKService', 'ackUibModal', '$rootScope',
function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, $filter, SweetAlert, orgHKService, ackUibModal) { function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, $filter, SweetAlert, orgHKService, ackUibModal, $rootScope) {
var selectedModel = '.addOrgControlPop'; //'#addOrgControlPop' + $scope.dimensionId; var selectedModel = '.addOrgControlPop'; //'#addOrgControlPop' + $scope.dimensionId;
...@@ -124,6 +124,8 @@ ...@@ -124,6 +124,8 @@
if ($scope.isAdd) { if ($scope.isAdd) {
editModel.isActive = true; editModel.isActive = true;
editModel.shareholders = $scope.shareholderDatasource;
editModel.directors = $scope.directorDatasource;
orgHKService.addOrg(editModel).success(function (orgId) { orgHKService.addOrg(editModel).success(function (orgId) {
if (orgId && !orgId.result) { if (orgId && !orgId.result) {
SweetAlert.warning($translate.instant(orgId.resultMsg)); SweetAlert.warning($translate.instant(orgId.resultMsg));
...@@ -186,17 +188,6 @@ ...@@ -186,17 +188,6 @@
})); }));
}; };
// 重置机构信息
var resetRegion = function () {
var defaultData = null;
$scope.CityList = defaultData;
$scope.ProvinceList = defaultData;
$scope.selectProvince = defaultData;
$scope.selectCity = defaultData;
$scope.selectRegionID = defaultData;
};
// 验证开始时间 // 验证开始时间
$scope.checkStartDate = function (row) { $scope.checkStartDate = function (row) {
...@@ -348,6 +339,10 @@ ...@@ -348,6 +339,10 @@
var initParams = function () { var initParams = function () {
$scope.editOrgModel = {}; $scope.editOrgModel = {};
$scope.selectCompany = {}; $scope.selectCompany = {};
$scope.directorDatasource = [];
$scope.shareholderDatasource = [];
$scope.gModel = {};
$scope.isLocal = true; $scope.isLocal = true;
// 登记状态 // 登记状态
$scope.regStatusList = constant.RegStatusList; $scope.regStatusList = constant.RegStatusList;
...@@ -379,9 +374,9 @@ ...@@ -379,9 +374,9 @@
keyExpr: "id", keyExpr: "id",
columns: [ columns: [
{ {
dataField: "investment_entity_id", dataField: "investmentEntity",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('InvestmentEntity'), caption: $translate.instant('investmentEntity'),
calculateDisplayValue: function (data) { calculateDisplayValue: function (data) {
// var importType1 = _.find(constant.importTypeList, function (item) { // var importType1 = _.find(constant.importTypeList, function (item) {
// return item.value == data.importType; // return item.value == data.importType;
...@@ -399,9 +394,9 @@ ...@@ -399,9 +394,9 @@
caption: $translate.instant('ownershipForm'), caption: $translate.instant('ownershipForm'),
}, },
{ {
dataField: "commonPreferred", dataField: "commonOrPreferred",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('CommonPreferred'), caption: $translate.instant('commonOrPreferred'),
calculateDisplayValue: function (data) { calculateDisplayValue: function (data) {
// var importType1 = _.find(constant.importTypeList, function (item) { // var importType1 = _.find(constant.importTypeList, function (item) {
// return item.value == data.importType; // return item.value == data.importType;
...@@ -429,9 +424,9 @@ ...@@ -429,9 +424,9 @@
caption: $translate.instant('operation'), caption: $translate.instant('operation'),
cellTemplate: function (container, options) { cellTemplate: function (container, options) {
try { try {
$('<button type="button" class="btn btn-in-grid" style="margin-top: -11px;" onclick = "editShareholder(' + options.data.id + ')"><i class="material-icons middle" style="vertical-align: text-bottom">modify</i>edit</button>&nbsp;&nbsp;') $('<button type="button" class="btn btn-in-grid" style="margin-top: -11px;" onclick = "editShareholder(\'' + options.data.id + '\')"><i class="material-icons middle" style="vertical-align: text-bottom">modify</i>edit</button>&nbsp;&nbsp;')
.appendTo(container); .appendTo(container);
$('<button type="button" class="btn btn-in-grid" style="margin-top: -11px;" onclick = "deleteShareholder(' + options.data.id + ')"><i class="material-icons middle" style="vertical-align: text-bottom">delete</i>delete</button>&nbsp;&nbsp;') $('<button type="button" class="btn btn-in-grid" style="margin-top: -11px;" onclick = "deleteShareholder(\'' + options.data.id + '\')"><i class="material-icons middle" style="vertical-align: text-bottom">delete</i>delete</button>&nbsp;&nbsp;')
.appendTo(container); .appendTo(container);
} }
catch (e) { catch (e) {
...@@ -492,9 +487,9 @@ ...@@ -492,9 +487,9 @@
keyExpr: "id", keyExpr: "id",
columns: [ columns: [
{ {
dataField: "director_name", dataField: "directorName",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('director_name') caption: $translate.instant('directorName')
}, },
{ {
dataField: "residency", dataField: "residency",
...@@ -502,34 +497,28 @@ ...@@ -502,34 +497,28 @@
caption: $translate.instant('residency'), caption: $translate.instant('residency'),
}, },
{ {
dataField: "date_of_appointment", dataField: "dateOfAppointment",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('date_of_appointment'), caption: $translate.instant('dateOfAppointment'),
calculateDisplayValue: function (data) { dataType: "date",
// var importType1 = _.find(constant.importTypeList, function (item) { format: "yyyy-MM-dd"
// return item.value == data.importType;
// });
// if (importType1) {
// return importType1.name;
// } else {
// return '未知';
// }
}
}, },
{ {
dataField: "date_of_resignation", dataField: "dateOfResignation",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('date_of_resignation'), caption: $translate.instant('dateOfResignation'),
dataType: "date",
format: "yyyy-MM-dd"
}, },
{ {
dataField: "is_executive", dataField: "executive",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('is_executive'), caption: $translate.instant('executive'),
}, },
{ {
dataField: "other_roles", dataField: "otherRoles",
allowHeaderFiltering: false, allowHeaderFiltering: false,
caption: $translate.instant('other_roles'), caption: $translate.instant('otherRoles'),
}, },
{ {
dataField: "id", dataField: "id",
...@@ -537,9 +526,9 @@ ...@@ -537,9 +526,9 @@
caption: $translate.instant('operation'), caption: $translate.instant('operation'),
cellTemplate: function (container, options) { cellTemplate: function (container, options) {
try { try {
$('<button type="button" class="btn btn-in-grid" style="margin-top: -11px;" onclick = "editDirector(' + options.data.id + ')"><i class="material-icons middle" style="vertical-align: text-bottom">modify</i>edit</button>&nbsp;&nbsp;') $('<button type="button" class="btn btn-in-grid" style="margin-top: -11px;" onclick = "editDirector(\'' + options.data.id + '\')"><i class="material-icons middle" style="vertical-align: text-bottom">modify</i>edit</button>&nbsp;&nbsp;')
.appendTo(container); .appendTo(container);
$('<button type="button" class="btn btn-in-grid" style="margin-top: -11px;" onclick = "deleteDirector(' + options.data.id + ')"><i class="material-icons middle" style="vertical-align: text-bottom">delete</i>delete</button>&nbsp;&nbsp;') $('<button type="button" class="btn btn-in-grid" style="margin-top: -11px;" onclick = "deleteDirector(\'' + options.data.id + '\')"><i class="material-icons middle" style="vertical-align: text-bottom">delete</i>delete</button>&nbsp;&nbsp;')
.appendTo(container); .appendTo(container);
} }
catch (e) { catch (e) {
...@@ -712,7 +701,7 @@ ...@@ -712,7 +701,7 @@
valueExpr: 'id', valueExpr: 'id',
displayExpr: 'name' displayExpr: 'name'
}, },
dateOfIncorporationOption:{ dateOfIncorporationOption: {
bindingOptions: { bindingOptions: {
value: 'editOrgModel.dateOfIncorporation' value: 'editOrgModel.dateOfIncorporation'
}, },
...@@ -837,10 +826,77 @@ ...@@ -837,10 +826,77 @@
$scope.isShowShareholderModal = false; $scope.isShowShareholderModal = false;
}; };
$scope.saveShareholder = function (shareholderEntity) {
var shareholder = _.filter($scope.shareholderDatasource, function (item) {
return item.id === shareholderEntity.id;
});
if (shareholder && shareholder.length > 0) {
$scope.shareholderDatasource = _.without($scope.shareholderDatasource, shareholder[0]);
}
$scope.shareholderDatasource.push(shareholderEntity);
};
window.editShareholder = function (id) {
console.log("editShareholder " + id);
var shareholder = _.filter($scope.shareholderDatasource, function (item) {
return item.id === id;
});
if (shareholder && shareholder.length > 0) {
$scope.gModel.editShareholderModel = shareholder[0];
$scope.isShowShareholderModal = true;
}
};
window.deleteShareholder = function (id) {
console.log("deleteShareholder " + id);
var shareholder = _.filter($scope.shareholderDatasource, function (item) {
return item.id === id;
});
if (shareholder && shareholder.length > 0) {
$scope.shareholderDatasource = _.without($scope.shareholderDatasource, shareholder[0]);
}
};
$scope.closeDirector = function () { $scope.closeDirector = function () {
$scope.isShowDirectorModal = false; $scope.isShowDirectorModal = false;
}; };
$scope.saveDirector = function (directorEntity) {
var director = _.filter($scope.directorDatasource, function (item) {
return item.id === directorEntity.id;
});
if (director && director.length > 0) {
$scope.directorDatasource = _.without($scope.directorDatasource, director[0]);
}
$scope.directorDatasource.push(directorEntity);
};
window.editDirector = function (id) {
console.log("editDirector " + id);
var director = _.filter($scope.directorDatasource, function (item) {
return item.id === id;
});
if (director && director.length > 0) {
$scope.gModel.editDirectorModel = director[0];
$scope.isShowDirectorModal = true;
}
};
window.deleteDirector = function (id) {
console.log("deleteDirector " + id);
var director = _.filter($scope.directorDatasource, function (item) {
return item.id === id;
});
if (director && director.length > 0) {
$scope.directorDatasource = _.without($scope.directorDatasource, director[0]);
}
};
//模态框管理 //模态框管理
$scope.modalManage = { $scope.modalManage = {
editOrgModal: { editOrgModal: {
...@@ -868,6 +924,10 @@ ...@@ -868,6 +924,10 @@
$scope.$watch('isShow', function (newValue, oldValue) { $scope.$watch('isShow', function (newValue, oldValue) {
if (newValue) { if (newValue) {
$scope.modalManage.editOrgModal.open(); $scope.modalManage.editOrgModal.open();
$scope.editOrgModel = {};
$scope.selectCompany = {};
$scope.directorDatasource = [];
$scope.shareholderDatasource = [];
} }
}); });
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
View file @ 5783d9e9
...@@ -169,8 +169,7 @@ ...@@ -169,8 +169,7 @@
</button> </button>
</span> </span>
</div> </div>
<edit-organization-shareholder-modal is-show-s="isShowShareholderModal" parent-page=".edit-organization-modal-wrapper" edit-model="editShareholder" <edit-organization-shareholder-modal is-show-s="isShowShareholderModal" parent-page=".edit-organization-modal-wrapper" edit-model-s="gModel.editShareholderModel" on-close="closeSharehoder()" on-save="saveShareholder(shareholderEntity)"></edit-organization-shareholder-modal>
on-close="closeSharehoder()"></edit-organization-shareholder-modal> <edit-organization-director-modal is-show-d="isShowDirectorModal" parent-page=".edit-organization-modal-wrapper" edit-model-d="gModel.editDirectorModel" on-close="closeDirector()" on-save="saveDirector(directorEntity)"></edit-organization-director-modal>
<edit-organization-director-modal is-show-d="isShowDirectorModal" parent-page=".edit-organization-modal-wrapper" edit-model="editDirector" on-close="closeDirector()"></edit-organization-director-modal>
</script> </script>
</div> </div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.ctrl.js
View file @ 5783d9e9
commonModule.controller('editOrganizationShareholderModalController', ['$scope', '$log', 'ackUibModal','$translate', function ($scope, $log, ackUibModal,$translate) { commonModule.controller('editOrganizationShareholderModalController', ['$scope', '$log', 'ackUibModal', '$translate', function ($scope, $log, ackUibModal, $translate) {
'use strict'; 'use strict';
$scope.isShow = false;
//模态框管理 //模态框管理
$scope.modalManage = { $scope.modalManage = {
shareholderModal: { shareholderModal: {
...@@ -16,23 +14,28 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope', ...@@ -16,23 +14,28 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
$scope.modalInstance.open(); $scope.modalInstance.open();
}, },
close: function () { close: function () {
$scope.onClose();
$scope.modalInstance.close(); $scope.modalInstance.close();
}, },
cancel: function () { cancel: function () {
$scope.onClose(); $scope.onClose();
$scope.modalInstance.cancel(); $scope.modalInstance.cancel();
}, },
save:function () { save: function () {
var dxResult = DevExpress.validationEngine.validateGroup($('#shareholderControlForm').dxValidationGroup("instance")).isValid; var dxResult = DevExpress.validationEngine.validateGroup($('#shareholderControlForm').dxValidationGroup("instance")).isValid;
if (dxResult) { if (dxResult) {
if (!$scope.editModelS.id) {
$scope.editModelS.id = PWC.newGuid();
}
$scope.onSave({shareholderEntity: $scope.editModelS});
$scope.editModelS = {};
$scope.modalManage.shareholderModal.close();
} }
} }
} }
}; };
var initParams = function () { var initParams = function () {
$scope.editModel = {};
$scope.ownershipFormTypeList = constant.organizationHK.OwnershipForm; $scope.ownershipFormTypeList = constant.organizationHK.OwnershipForm;
$scope.commonOrPreferredTypeList = ['Commmon', 'Preferred']; $scope.commonOrPreferredTypeList = ['Commmon', 'Preferred'];
$scope.classOfSharesTypeList = ['A', 'B']; $scope.classOfSharesTypeList = ['A', 'B'];
...@@ -47,11 +50,11 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope', ...@@ -47,11 +50,11 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
$scope.textboxOption = { $scope.textboxOption = {
investmentEntityOption: { investmentEntityOption: {
bindingOptions: { bindingOptions: {
dataSource: 'dropdownDatasource.investmentEntityTypeList', dataSource: 'dropdownDatasource.ownershipFormTypeList',
value: 'editModel.investmentEntity' value: 'editModelS.investmentEntity'
}, },
onSelectionChanged: function (args) { onSelectionChanged: function (args) {
$scope.editModel.investmentEntity = args.selectedItem.id; // $scope.editModelS.investmentEntity = args.selectedItem.id;
}, },
itemTemplate: function (itemData, itemIndex, itemElement) { itemTemplate: function (itemData, itemIndex, itemElement) {
var span = $('<span title="' + itemData.name + '">').text(itemData.name); var span = $('<span title="' + itemData.name + '">').text(itemData.name);
...@@ -64,10 +67,10 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope', ...@@ -64,10 +67,10 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
ownershipFormOption: { ownershipFormOption: {
bindingOptions: { bindingOptions: {
dataSource: 'dropdownDatasource.ownershipFormTypeList', dataSource: 'dropdownDatasource.ownershipFormTypeList',
value: 'editModel.ownershipForm' value: 'editModelS.ownershipForm'
}, },
onSelectionChanged: function (args) { onSelectionChanged: function (args) {
$scope.editModel.ownershipForm = args.selectedItem.id; // $scope.editModelS.ownershipForm = args.selectedItem.id;
}, },
itemTemplate: function (itemData, itemIndex, itemElement) { itemTemplate: function (itemData, itemIndex, itemElement) {
var span = $('<span title="' + itemData.name + '">').text(itemData.name); var span = $('<span title="' + itemData.name + '">').text(itemData.name);
...@@ -80,10 +83,10 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope', ...@@ -80,10 +83,10 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
commonOrPreferredOption: { commonOrPreferredOption: {
bindingOptions: { bindingOptions: {
dataSource: 'dropdownDatasource.commonOrPreferredTypeList', dataSource: 'dropdownDatasource.commonOrPreferredTypeList',
value: 'editModel.commonOrPreferred' value: 'editModelS.commonOrPreferred'
}, },
onSelectionChanged: function (args) { onSelectionChanged: function (args) {
$scope.editModel.commonOrPreferred = args.selectedItem.id; // $scope.editModelS.commonOrPreferred = args.selectedItem.id;
}, },
itemTemplate: function (itemData, itemIndex, itemElement) { itemTemplate: function (itemData, itemIndex, itemElement) {
var span = $('<span title="' + itemData.name + '">').text(itemData.name); var span = $('<span title="' + itemData.name + '">').text(itemData.name);
...@@ -96,10 +99,10 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope', ...@@ -96,10 +99,10 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
classOfSharesOption: { classOfSharesOption: {
bindingOptions: { bindingOptions: {
dataSource: 'dropdownDatasource.classOfSharesTypeList', dataSource: 'dropdownDatasource.classOfSharesTypeList',
value: 'editModel.classOfShares' value: 'editModelS.classOfShares'
}, },
onSelectionChanged: function (args) { onSelectionChanged: function (args) {
$scope.editModel.classOfShares = args.selectedItem.id; // $scope.editModelS.classOfShares = args.selectedItem.id;
}, },
itemTemplate: function (itemData, itemIndex, itemElement) { itemTemplate: function (itemData, itemIndex, itemElement) {
var span = $('<span title="' + itemData.name + '">').text(itemData.name); var span = $('<span title="' + itemData.name + '">').text(itemData.name);
...@@ -111,7 +114,7 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope', ...@@ -111,7 +114,7 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
}, },
votingPercentageOption: { votingPercentageOption: {
bindingOptions: { bindingOptions: {
value: 'editModel.votingPercentage' value: 'editModelS.votingPercentage'
}, },
maxLength: 100, maxLength: 100,
placeholder: $translate.instant('votingPercentage'), placeholder: $translate.instant('votingPercentage'),
...@@ -169,14 +172,13 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope', ...@@ -169,14 +172,13 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
var thisModuleService = { var thisModuleService = {
initEvents: function () { initEvents: function () {
$scope.save = function () {
};
}, },
initWatches: function () { initWatches: function () {
$scope.$watch('isShowS', function (newValue, oldValue) { $scope.$watch('isShowS', function (newValue, oldValue) {
if (newValue) { if (newValue) {
console.log($scope.$parent.$parent.gModel.editShareholderModel);
$scope.editModelS= $scope.$parent.$parent.gModel.editShareholderModel;
$scope.modalManage.shareholderModal.open(); $scope.modalManage.shareholderModal.open();
} }
}); });
...@@ -185,6 +187,7 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope', ...@@ -185,6 +187,7 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
(function initialize() { (function initialize() {
$log.debug('editOrganizationShareholderModalController.ctor()...'); $log.debug('editOrganizationShareholderModalController.ctor()...');
$scope.editModelS={};
initParams(); initParams();
init(); init();
thisModuleService.initWatches(); thisModuleService.initWatches();
......
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.js
View file @ 5783d9e9
...@@ -9,8 +9,9 @@ commonModule.directive('editOrganizationShareholderModal', ['$log', function ($l ...@@ -9,8 +9,9 @@ commonModule.directive('editOrganizationShareholderModal', ['$log', function ($l
scope: { scope: {
isShowS: '=?', isShowS: '=?',
parentPage: '@', parentPage: '@',
editModel: '=?', editModelS: '=?',
onClose:'&' onClose:'&',
onSave:'&'
}, },
link: function (scope, element) { link: function (scope, element) {
} }
......
atms-web/src/main/webapp/app/common/webservices/organizationHK.svc.js
View file @ 5783d9e9
...@@ -22,6 +22,18 @@ webservices.factory('orgHKService', ['$http', 'apiConfig', function ($http, apiC ...@@ -22,6 +22,18 @@ webservices.factory('orgHKService', ['$http', 'apiConfig', function ($http, apiC
}, },
addOrg: function (org) { addOrg: function (org) {
return $http.post('/orgHK/add', org, apiConfig.create()); return $http.post('/orgHK/add', org, apiConfig.create());
},
addDirecotr: function (orgDirector) {
return $http.post('/orgHK/addDirecotr', orgDirector, apiConfig.create());
},
addShareholder: function (orgShareholder) {
return $http.post('/orgHK/addShareholder', orgShareholder, apiConfig.create());
},
updateDirector: function (orgDirector) {
return $http.put('/orgHK/updateDirector', orgDirector, apiConfig.create());
},
updateShareholder: function (orgShareholder) {
return $http.put('/orgHK/updateShareholder', orgShareholder, apiConfig.create());
} }
} }
}]); }]);
\ No newline at end of file
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