Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractExcelResponse.java

@@ -181,4 +181,10 @@ public class ContractExcelResponse {
     @ExcelProperty("备注")
     private String bz;
 
+    @ExcelProperty("挂靠比例")
+    private BigDecimal attachRatio;
+
+    @ExcelProperty("挂靠分包金额")
+    private BigDecimal attachAmount;
+
 }

zjugis-business/src/main/resources/mapper/oracle/ContractMapper.xml

@@ -346,7 +346,7 @@
         SELECT c.MAIN_TYPE,c.SECOND_TYPE,c.AMOUNT_STATUS,c.NAME,c.ASSIGNEE_NAME,c.CLIENT_NAME,c.IS_SIGN,
         c.CONTRACT_NUMBER,c.CONTRACT_ON,c.CONTRACT_OFF,c.PAYMENT_TERMS,c.TAX_HSJE_JSKF,c.TAX_HSJE_FW,c.TAX_HSJE_RJCP,
         c.TAX_HSJE_YJ,c.TAX_HSJE_TOTAL,c.TAX_ZHSL,c.TAX_BHSZE,c.TAX_SOFTPATENT,c.WHTK_I_WHQ,c.WHTK_I_MFWH,
-        c.WHTK_WHRQ_BEGIN,c.WHTK_WHRQ_END,c.CREATE_TIME,c.BANKACCOUNT,c.SPECIAL_CLAUSE,c.SIGN_WAY,c.IS_BUSINESS_UNIT,c.BZ,
+        c.WHTK_WHRQ_BEGIN,c.WHTK_WHRQ_END,c.CREATE_TIME,c.BANKACCOUNT,c.SPECIAL_CLAUSE,c.SIGN_WAY,c.IS_BUSINESS_UNIT,c.BZ,c.ATTACH_RATIO,c.ATTACH_AMOUNT,
         COALESCE(c.VIRTUAL_AMOUNT, c.CONTRACT_AMOUNT) as CONTRACT_AMOUNT,
         COALESCE(PA.invoiceAmount,0) as invoiceAmount,
         COALESCE(PA.returnAmount,0) as returnAmount,

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

@@ -117,7 +117,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                               </div>
                           </td>
                           <td class="th">
-                              <div class="form-label">挂靠金额：</div>
+                              <div class="form-label">分包金额：</div>
                           </td>
                           <td>
                               <div class="form-group">

zjugis-business/src/main/resources/templates/FlowContract/js/apply.js

@@ -50,7 +50,7 @@
                 return;
             }
             var contractAmount = $("[name='contract$contractAmount'] input").val()
-            var attachAmount = parseFloat($(this).val()) * contractAmount / 100;
+            var attachAmount =contractAmount - parseFloat($(this).val()) * contractAmount / 100;
             $("[name='contract$attachAmount'] input").val(attachAmount);
         })
 
@@ -59,7 +59,7 @@
                 return;
             }
             var attachRatio = $("[name='contract$attachRatio'] input").val()
-            var attachAmount = parseFloat($(this).val()) * attachRatio / 100;
+            var attachAmount = $(this).val() - parseFloat($(this).val()) * attachRatio / 100;
             $("[name='contract$attachAmount'] input").val(attachAmount);
         })
     }

zjugis-workflow/src/main/java/com/zjugis/z_workflow/service/ProcessEngineService.java

@@ -1914,7 +1914,7 @@ public class ProcessEngineService {
 			try {
 				Map params = buildEventApiParam(conditionEvent, triggerPosition, apiParams);
 				retMap.put("postParam", JSON.toJSONString(params));
-				retVal = HttpUtil.post(conditionEvent.getRestfulUrl(), params);
+                retVal = ServiceApiUtils.getDataFromServiceApi(conditionEvent.getRestfulUrl(), params);
 				JSONObject retJson = JSON.parseObject(retVal);
 				if (Objects.isNull(retJson)) {
 					retMap.put("result", true);