Revert "[Bugfix] fixed save formular cannot save to db"

This reverts commit 3acb4e28.

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

@@ -254,7 +254,7 @@ public class CellTemplateServiceImpl extends AbstractService {
 
     private String getFormulaDataSource(String formula, List<String> keyValueConfigIds) {
         FormulaConfigExample example = new FormulaConfigExample();
-        example.setOrderByClause("LENGTH(FORMULA_NAME) desc");
+        example.setOrderByClause("LENGTH(FormulaName) desc");
         List<FormulaConfig> dataSourceList = formulaConfigMapper.selectByExample(example);
         List<String> nameList = new ArrayList<>();
         FormulaHelper formulaHelper = new FormulaHelper();
@@ -270,7 +270,7 @@ public class CellTemplateServiceImpl extends AbstractService {
         String keyValueMethodName = "KEYVALUE(";
         if (tmpFormula.contains(keyValueMethodName)) {
             KeyValueConfigExample keyValueConfigExample = new KeyValueConfigExample();
-            keyValueConfigExample.setOrderByClause("LENGTH(KEY_CODE) desc");
+            keyValueConfigExample.setOrderByClause("LENGTH(KeyCode) desc");
             List<KeyValueConfig> keyValueList = keyValueConfigMapper.selectByExample(keyValueConfigExample);
             for (KeyValueConfig keyValueConfig : keyValueList) {
                 if (tmpFormula.contains(keyValueMethodName + "\"" + keyValueConfig.getKeyCode().toUpperCase() + "\")")) {

atms-api/src/main/resources/bpmn/approval.bpmn

@@ -69,49 +69,49 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="_13" id="BPMNEdge__13" sourceElement="_5" targetElement="_12">
-        <di:waypoint x="495.0" y="192.5"/>
+        <di:waypoint x="510.0" y="192.5"/>
         <di:waypoint x="640.0" y="191.0"/>
         <bpmndi:BPMNLabel>
           <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="_15" id="BPMNEdge__15" sourceElement="_11" targetElement="_5">
-        <di:waypoint x="456.0" y="380.0"/>
+        <di:waypoint x="456.0" y="365.0"/>
         <di:waypoint x="456.0" y="220.0"/>
         <bpmndi:BPMNLabel>
           <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="_14" id="BPMNEdge__14" sourceElement="_3" targetElement="_11">
-        <di:waypoint x="275.0" y="397.5"/>
+        <di:waypoint x="290.0" y="397.5"/>
         <di:waypoint x="440.0" y="396.0"/>
         <bpmndi:BPMNLabel>
           <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="_16" id="BPMNEdge__16" sourceElement="_11" targetElement="_9">
-        <di:waypoint x="472.0" y="396.0"/>
+        <di:waypoint x="487.0" y="396.0"/>
         <di:waypoint x="760.0" y="396.0"/>
         <bpmndi:BPMNLabel>
           <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="_4" id="BPMNEdge__4" sourceElement="_2" targetElement="_3">
-        <di:waypoint x="82.0" y="396.0"/>
+        <di:waypoint x="97.0" y="396.0"/>
         <di:waypoint x="190.0" y="397.5"/>
         <bpmndi:BPMNLabel>
           <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_12" targetElement="_7">
-        <di:waypoint x="672.0" y="191.0"/>
+        <di:waypoint x="687.0" y="191.0"/>
         <di:waypoint x="765.0" y="121.0"/>
         <bpmndi:BPMNLabel>
           <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="_10" id="BPMNEdge__10" sourceElement="_12" targetElement="_9">
-        <di:waypoint x="672.0" y="191.0"/>
+        <di:waypoint x="687.0" y="191.0"/>
         <di:waypoint x="760.0" y="396.0"/>
         <bpmndi:BPMNLabel>
           <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>

atms-web/pom.xml

@@ -198,7 +198,7 @@
                 <version>2.1</version>
                 <configuration>
                     <!-- 通过maven tomcat7:run运行项目时，访问项目的端口号 -->
-                    <port>18080</port>
+                    <port>8080</port>
                     <!-- 项目访问路径  本例：localhost:9090,  如果配置的aa， 则访问路径为localhost:9090/aa-->
                     <path>/</path>
                     <uriEncoding>UTF-8</uriEncoding>

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

-api.url=http://10.158.230.144:8181/
+api.url=http://etms.longi-silicon.com:8180/
 
 cookie.maxAgeSeconds=86400