From 519886a70d630e3cdd6c0f40f55fcebc6e780dc5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 17:45:11 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java | 56 ++++----
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 9 +
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 10 +
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 8 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 227 +------------------------------------
7 files changed, 67 insertions(+), 249 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index f49a244..d322936 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -88,19 +88,11 @@
private IServiceSystemmessageService ServiceSystemmessage;
@Autowired
- private IBaseOnlyvalueService baseOnlyvalueService;
-
- @Autowired
private IServiceExternalpersonService externalpersonService;
@Autowired
private ISysPostService postService;
- @Autowired
- private DataSourceTransactionManager transactionManager;
-
- @Autowired
- private TransactionDefinition transactionDefinition;
@Autowired
private DingTalkService dingTalkService;
@@ -271,216 +263,15 @@
return AjaxResult.success(id);
}
-
-// public int addReiSharedDatd(ServiceFund serviceFund, int nType) {
-// //remShare = ;
-// ServiceFundShared remShare = null;
-// if (nType == 1) {
-// remShare = new ServiceFundShared();
-// remShare.setSerfunid(serviceFund.getId());
-// } else //modify
-// {
-// List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
-// if (remlist != null) remShare = remlist.get(0);
-// }
-//
-// remShare.setDonorno(serviceFund.getDonorno());
-// remShare.setDonorname(serviceFund.getDonorname());
-// remShare.setUserno(serviceFund.getUserno());
-// remShare.setUsername(serviceFund.getUsername());
-// remShare.setUnitname(serviceFund.getUnitname());
-// remShare.setUnitno(serviceFund.getUnitno());
-// remShare.setUnituserno(serviceFund.getUnituserno());
-// remShare.setPhone(serviceFund.getPhone());
-// remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
-// remShare.setAnnexregistform(serviceFund.getAnnexregistform());
-// Double nTemp = serviceFund.getPretaxcost();
-// if (nTemp == null) nTemp = 0d;
-// remShare.setPretaxcost(BigDecimal.valueOf(nTemp));
-// //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
-// // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
-//
-// nTemp = serviceFund.getTaxedcost();
-// if (nTemp == null) nTemp = 0d;
-// remShare.setTaxedcost(BigDecimal.valueOf(nTemp));
-//
-// nTemp = serviceFund.getTotalcost();
-// if (nTemp == null) nTemp = 0d;
-// remShare.setTotalcost(BigDecimal.valueOf(nTemp));
-//
-// nTemp = serviceFund.getExpertcost();
-// if (nTemp == null) nTemp = 0.0;
-// remShare.setExpertcost(BigDecimal.valueOf(nTemp));
-//
-// nTemp = serviceFund.getEthicscost();
-// if (nTemp == null) nTemp = 0.0;
-// remShare.setEthicscost(BigDecimal.valueOf(nTemp));
-//
-// nTemp = serviceFund.getMedicalcost();
-// if (nTemp == null) nTemp = 0.0;
-// remShare.setMedicalcost(BigDecimal.valueOf(nTemp));
-//
-// nTemp = serviceFund.getFamilycost();
-// if (nTemp == null) nTemp = 0.0;
-// remShare.setFamilycost(BigDecimal.valueOf(nTemp));
-//
-// nTemp = serviceFund.getAftercarecost();
-// if (nTemp == null) nTemp = 0.0;
-// remShare.setAftercarecost(BigDecimal.valueOf(nTemp));
-//
-// nTemp = serviceFund.getAmountrequested();
-// if (nTemp == null) nTemp = 0.0;
-// remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
-//
-//
-// remShare.setApplytype(serviceFund.getApplytype());
-//
-// nTemp = serviceFund.getPrepaidamount();
-// if (nTemp == null) nTemp = 0.0;
-// remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
-//
-// remShare.setInvoicecount(serviceFund.getInvoicecount());
-// remShare.setAttachcount(serviceFund.getAttachcount());
-// remShare.setManagerno(serviceFund.getManagerno());
-// remShare.setManagername(serviceFund.getManagername());
-// remShare.setDeptmentno(serviceFund.getDeptmentno());
-// remShare.setDeptmentname(serviceFund.getDeptmentname());
-// remShare.setOpochecker(serviceFund.getOpochecker());
-// remShare.setFinvicepresident(serviceFund.getFinvicepresident());
-// remShare.setBusvicepresident(serviceFund.getBusvicepresident());
-// remShare.setOfficedirector(serviceFund.getOfficedirector());
-// remShare.setFinancedirector(serviceFund.getFinancedirector());
-// remShare.setFinancechecher(serviceFund.getFinancechecher());
-// //remShare.setIsdistribute(serviceFund.getIsdistribute());
-// remShare.setRecordstatus(serviceFund.getRecordstatus());
-// remShare.setUploadflag(serviceFund.getUploadflag());
-// remShare.setUploadtime(serviceFund.getUploadtime());
-// long nLevel = serviceFund.getFlowlevel();
-// remShare.setFlowlevel(nLevel);
-//
-// remShare.setInfoid(serviceFund.getInfoid());
-//
-// //remShare.setOaid(serviceReimbursement.getOaid());
-// //remShare.setDonorno(serviceReimbursement.getDonorno());
-//
-// boolean bRet = false;
-// if (nType == 1) {
-// bRet = fundServiceShare.save(remShare);
-// } else {
-// //remShare.setId(serviceReimbursement.);
-// bRet = fundServiceShare.updateById(remShare);
-// }
-//
-// //if(!bRet) return -1;
-// String strMutfileUrl = remShare.getAnnexbankcard();
-// //鏈夐檮浠舵椂鎵嶈皟鐢ㄧ涓夋柟杩涜涓婁紶
-// if (strMutfileUrl == null) return 0;
-// if (strMutfileUrl.isEmpty()) return 0;
-//
-// try {
-// uploadOAFileAndUpdateDb(remShare);
-// } catch (Exception e) {
-// logger.error("璋冪敤绗笁鏂规帴鍙ｅ嚭閿�!");
-// e.printStackTrace();
-// }
-//
-// //姝ゅ淇濆瓨鎴愬姛鍚庤涓婁紶OA锛屼繚瀛樿繑鍥炲��
-//
-// return 0;
-// }
-
-
-// int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {
-// //涓婁紶OA鏂囦欢
-// //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";
-// String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
-// //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";
-// //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
-//
-//
-// Map<String, Object> map = new HashMap<String, Object>();
-// map.put("userName", "opo");
-// map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
-// map.put("loginName", "demo3");
-//
-// JSONObject jsonObj = new JSONObject(map);
-//
-// System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
-// String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());//
-// //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//寰楀埌杩斿洖鐨則oken?
-//
-// JSONObject json1 = JSONObject.parseObject(strRes);
-// strRes = json1.get("id").toString();
-//
-// ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠ｈ〃澶辫触
-//
-// //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
-//
-// String filePath = RuoYiConfig.getUploadPath();
-// String strMutfileUrl = remShare.getAnnexbankcard();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
-//
-// String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
-// //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;
-// //strFUrl = String.format(strFUrl, strRes);
-//
-// /*File test = null;
-// File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17");
-// if (file.exists() && file.isDirectory()) {
-// // 鑾峰彇鎵�鏈夌洸鐩掓枃浠跺す
-// File[] ones = file.listFiles();
-// for (File one : ones) {
-// test = one;
-// }
-// }*/
-//
-// String filename = "";
-// String fileid = "";
-//
-// String[] urlArray = strMutfileUrl.split(",");
-// for (int i = 0; i < urlArray.length; i++) {
-// String strOneFileName = urlArray[i];
-// String strTemp = strOneFileName.substring(15);
-// String strFile = filePath + strTemp;
-// //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);
-// String struploadResult = "";
-// File filetest = new File(strFile);
-// try {
-// struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-//
-//
-// //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj);
-// if (struploadResult == null) return 0;
-// if (struploadResult.isEmpty()) return 0;
-//
-// JSONObject jsonR = JSONObject.parseObject(struploadResult);
-//
-// JSONArray jsonArr = jsonR.getJSONArray("atts");
-// for (int j = 0; j < jsonArr.size(); j++) {
-// JSONObject jsonRet = jsonArr.getJSONObject(j);
-// String name1 = jsonRet.get("filename").toString();
-// String id1 = jsonRet.get("fileUrl").toString();
-// filename += name1;
-// fileid += id1;
-// if (i != urlArray.length - 1) {
-// filename += ",";
-// fileid += ",";
-// }
-// }
-//
-// }
-//
-// long nId = remShare.getId();
-// remShare.setId(nId);
-// remShare.setFilename(filename);
-// remShare.setFileid(fileid);
-// boolean bRet = fundServiceShare.updateById(remShare);
-// if (!bRet) return -1;
-//
-// return 0;
-// }
+ /**
+ * fund琛ㄤ腑锛屼慨鏀筬undTaxId
+ */
+ @ApiOperation("fund琛ㄤ腑锛屼慨鏀筬undTaxId")
+ @PostMapping("/editFundTaxId")
+ public AjaxResult editFundTaxId(@RequestBody ServiceFund serviceFund) {
+ boolean b = serviceFundService.updateFundTaxIdById(serviceFund.getId(), serviceFund.getFundTaxId());
+ return AjaxResult.success(b);
+ }
/**
* 鏂板璐圭敤姹囨��
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
index 348e725..eb1ce2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
@@ -53,29 +53,30 @@
List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
return getDataTable(list);
}
-
- /**
- * 瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
- */
- @ApiOperation("瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:export')")
- @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult export(ServiceFundtax serviceFundtax) {
- List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
- ExcelUtil<ServiceFundtax> util = new ExcelUtil<ServiceFundtax>(ServiceFundtax.class);
- return util.exportExcel(list, "涓撳璐圭敤绠楃◣鐢宠涓绘暟鎹�");
- }
-
- /**
- * 鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�
- */
- @ApiOperation("鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:query')")
- @GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
- return AjaxResult.success(serviceFundtaxService.getById(id));
- }
+//
+// /**
+// * 瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
+// */
+// @ApiOperation("瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�")
+// @PreAuthorize("@ss.hasPermi('system:fundtax:export')")
+// @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.EXPORT)
+// @GetMapping("/export")
+// public AjaxResult export(ServiceFundtax serviceFundtax) {
+// List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
+// ExcelUtil<ServiceFundtax> util = new ExcelUtil<ServiceFundtax>(ServiceFundtax.class);
+// return util.exportExcel(list, "涓撳璐圭敤绠楃◣鐢宠涓绘暟鎹�");
+// }
+//
+// /**
+// * 鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�
+// */
+// @ApiOperation("鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�")
+// @PreAuthorize("@ss.hasPermi('system:fundtax:query')")
+// @GetMapping(value = "/getInfo/{id}")
+// public AjaxResult getInfo(@PathVariable("id") Long id) {
+// return AjaxResult.success(serviceFundtaxService.getById(id));
+// }
+//
/**
* 淇敼涓撳璐圭敤绠楃◣鐢宠涓�
@@ -108,16 +109,15 @@
@PreAuthorize("@ss.hasPermi('system:fundtax:add')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.INSERT)
@PostMapping("/addFundTax")
- public AjaxResult addFundTax(@RequestBody List<ServiceFund> fundList) {
- ServiceFundtax serviceFundtax = new ServiceFundtax();
+ public AjaxResult addFundTax(@RequestBody ServiceFundtax serviceFundtax) {
serviceFundtax.setTaxedtime(new Date());
serviceFundtax.setApplyno(UUID.randomUUID().toString());
- boolean save = serviceFundtaxService.save(serviceFundtax);
- for (ServiceFund serviceFund : fundList) {
+ serviceFundtaxService.save(serviceFundtax);
+ for (ServiceFund serviceFund : serviceFundtax.getServiceFunds()) {
serviceFund.setFundTaxId(serviceFundtax.getId());
serviceFundService.updateById(serviceFund);
}
- return toAjax(save);
+ return toAjax(serviceFundtax.getId().intValue());
}
/**
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
index e2c21ca..c11bea1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -385,7 +385,14 @@
*/
@ApiModelProperty("涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
@Excel(name = "涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
- private Long fundTaxId;
+ private Long fundTaxId = null;
+
+ /**
+ * 绋庨噾
+ */
+ @ApiModelProperty("绋庨噾")
+ @Excel(name = "绋庨噾")
+ private Double taxcost;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java
index 588efef..fc7c241 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java
@@ -34,8 +34,10 @@
List<FundVO> selectVOList(FundVO fundVO);
- List<SpFinancialExpensesFundOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE, @Param("CHECKSTATUS") Integer CHECKSTATUS,@Param("donorname")String donorname);
+ List<SpFinancialExpensesFundOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE, @Param("CHECKSTATUS") Integer CHECKSTATUS, @Param("donorname") String donorname);
List<SpFinancialExpensesFundOut> getExpertfeeList(@Param("PAAPPLYTYPE") Integer PAAPPLYTYPE, @Param("DONORNAME") String DONORNAME, @Param("PACHECKNO") String PACHECKNO, @Param("CHECKSTATUS") Integer CHECKSTATUS, @Param("PADEPARTNO") String PADEPARTNO, @Param("PAUSERNAME") String PAUSERNAME);
+ Boolean updateFundTaxIdById(@Param("id") Long id,@Param("fundTaxId") Long fundTaxId);
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
index aa1f171..08604ec 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
@@ -72,5 +72,7 @@
Map<String, Object> exportFeeSum(Integer faxId);
+ public Boolean updateFundTaxIdById(Long id, Long fundTaxIds);
+
}
\ No newline at end of file
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index f115723..0610a8b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -19,6 +19,7 @@
import com.ruoyi.project.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.ibatis.annotations.Param;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFColor;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -934,7 +935,7 @@
new File(RuoYiConfig.getDownloadPath() + path).delete();
}
Map<String, Object> map = new HashMap<>();
- map.put("downloadUrl", "/profile/download/wordtemplate/" + name );
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name);
map.put("downloadName", name);
return map;
}
@@ -1167,4 +1168,9 @@
e.printStackTrace();
}
}
+
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateFundTaxIdById(Long id, Long fundTaxId) {
+ return serviceFundMapper.updateFundTaxIdById(id, fundTaxId);
+ }
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 8ff32ae..be87022 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -65,6 +65,7 @@
<result property="notes" column="notes"/>
<result property="jxrq" column="jxrq"/>
<result property="fundTaxId" column="fund_tax_id"/>
+ <result property="taxcost" column="TaxCost"/>
</resultMap>
<sql id="selectServiceFundVo">
@@ -127,6 +128,7 @@
upload_states,
jxrq,
notes,
+ TaxCost,
fund_tax_id
from service_fund
</sql>
@@ -270,4 +272,12 @@
resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
call SP_SELECT_EXPERTFEE(#{PAAPPLYTYPE,mode=IN,jdbcType=INTEGER},#{DONORNAME,mode=IN,jdbcType=VARCHAR},#{PACHECKNO,mode=IN,jdbcType=VARCHAR},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{PADEPARTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
</select>
+
+ <update id="updateFundTaxIdById">
+ update service_fund
+ <set>
+ fund_tax_id = #{fundTaxId}
+ </set>
+ where id = #{id}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3