ljy121 1 year ago
parent
commit
84d6dba5cc

+ 6 - 6
zjugis-business/src/main/java/com/zjugis/business/flow/contract/event/ContractEvent.java

@@ -178,7 +178,7 @@ public class ContractEvent extends BaseController {
         }
     }
 
-    @PostMapping
+    @PostMapping("/mainTypeFlow1")
     public String mainTypeFlow1(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
@@ -192,7 +192,7 @@ public class ContractEvent extends BaseController {
         }
     }
 
-    @PostMapping
+    @PostMapping("/mainTypeFlow2")
     public String mainTypeFlow2(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
@@ -206,7 +206,7 @@ public class ContractEvent extends BaseController {
         }
     }
 
-    @PostMapping
+    @PostMapping("/amountGt5")
     public String amountGt5(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
@@ -220,7 +220,7 @@ public class ContractEvent extends BaseController {
         }
     }
 
-    @PostMapping
+    @PostMapping("/amountLe5")
     public String amountLe5(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
@@ -234,7 +234,7 @@ public class ContractEvent extends BaseController {
         }
     }
 
-    @PostMapping
+    @PostMapping("/amountGt20")
     public String amountGt20(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
@@ -248,7 +248,7 @@ public class ContractEvent extends BaseController {
         }
     }
 
-    @PostMapping
+    @PostMapping("/amountLe20")
     public String amountLe20(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();

+ 23 - 23
zjugis-business/src/main/resources/templates/FlowContract/apply.ftl

@@ -539,29 +539,29 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                       </table>
                   </div>
               </div>
-              <div class="form-title">
-                  <div class="form-icon">
-                      <img src="/imgs/titleIcon.png" alt="">
-                      <span>合同里程碑信息</span>
-                  </div>
-              </div>
-              <div class="qjsjxx-box">
-                  <table class="form-table-info">
-                      <thead>
-                      <tr>
-                          <td>序号</td>
-                          <td>里程碑信息</td>
-                          <td>回款比例</td>
-                          <td>应回款金额(元)</td>
-                          <td>已回款金额(元)</td>
-                          <td>预计到款时间</td>
-                          <td>说明</td>
-                          <td>操作</td>
-                      </tr>
-                      </thead>
-                      <tbody class="tbody tbodyQjsq" name="milestone"></tbody>
-                  </table>
-              </div>
+<#--              <div class="form-title">-->
+<#--                  <div class="form-icon">-->
+<#--                      <img src="/imgs/titleIcon.png" alt="">-->
+<#--                      <span>合同里程碑信息</span>-->
+<#--                  </div>-->
+<#--              </div>-->
+<#--              <div class="qjsjxx-box">-->
+<#--                  <table class="form-table-info">-->
+<#--                      <thead>-->
+<#--                      <tr>-->
+<#--                          <td>序号</td>-->
+<#--                          <td>里程碑信息</td>-->
+<#--                          <td>回款比例</td>-->
+<#--                          <td>应回款金额(元)</td>-->
+<#--                          <td>已回款金额(元)</td>-->
+<#--                          <td>预计到款时间</td>-->
+<#--                          <td>说明</td>-->
+<#--                          <td>操作</td>-->
+<#--                      </tr>-->
+<#--                      </thead>-->
+<#--                      <tbody class="tbody tbodyQjsq" name="milestone"></tbody>-->
+<#--                  </table>-->
+<#--              </div>-->
 
           </div>
           <div class="ow-tab-content" name="yj">

+ 0 - 30
zjugis-business/src/main/resources/templates/FlowContractInvoice/apply.ftl

@@ -575,36 +575,6 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                       </table>
                   </div>
               </div>
-              <div class="form-title">
-                  <div class="form-icon">
-                      <img src="/imgs/titleIcon.png" alt="">
-                      <span>回款信息</span>
-                  </div>
-                  <div class="form-btn">
-                      <div id="addData">
-                          <img src="/imgs/addIcon.png" alt="">
-                          <span>新增</span>
-                      </div>
-                  </div>
-              </div>
-              <div class="qjsjxx-box">
-                  <table class="form-table-info">
-                      <thead>
-                      <tr>
-                          <td>序号</td>
-                          <td>里程碑信息</td>
-                          <td>回款比例</td>
-                          <td>应回款金额(元)</td>
-                          <td>已回款金额(元)</td>
-                          <td>预计到款时间</td>
-                          <td>说明</td>
-                          <td>操作</td>
-                      </tr>
-                      </thead>
-                      <tbody class="tbody tbodyQjsq" name="milestone"></tbody>
-                  </table>
-              </div>
-
           </div>
           <div class="ow-tab-content" name="yj">
               <#if WORKFLOW.OPINION! !="">