Home Explore Help
Sign In
yonge
/
mec
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

OA,签章完善

river 4 years ago
parent
5234f84e3f
commit
e3f71bcdeb
3 changed files with 2 additions and 153 deletions
Unified View Show Diff Stats
  1. 2 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java
  2. 0 105
      mec-biz/src/main/resources/config/contracts/financial2.ftl
  3. 0 47
      mec-web/src/main/java/com/ym/mec/web/controller/education/OaContractsController.java

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java
View File 

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 
 import java.io.File;
 
 import java.io.File;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
 import java.math.BigDecimal;
 
 import java.math.BigDecimal;
 
+import java.math.RoundingMode;
 
 import java.text.DateFormat;
 
 import java.text.DateFormat;
 
 import java.text.SimpleDateFormat;
 
 import java.text.SimpleDateFormat;
 
 import java.time.LocalDateTime;
 
 import java.time.LocalDateTime;
 
@@ -1320,7 +1321,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		params.put("organName", financialDto.getOrganName());
 
 		params.put("organName", financialDto.getOrganName());
 
 		params.put("realName", financialDto.getRealName());
 
 		params.put("realName", financialDto.getRealName());
 
 		params.put("feeType", financialDto.getFeeType());
 
 		params.put("feeType", financialDto.getFeeType());
 
-		params.put("totalMoney", financialDto.getTotalMoney());
 
+		params.put("totalMoney", financialDto.getTotalMoney().setScale(2, RoundingMode.HALF_UP));
 
 		params.put("hasLoan", financialDto.getHasLoan());
 
 		params.put("hasLoan", financialDto.getHasLoan());
 
 		params.put("memo", financialDto.getMemo());
 
 		params.put("memo", financialDto.getMemo());
 
 		params.put("circulationUsers", financialDto.getCirculationUsers());
 
 		params.put("circulationUsers", financialDto.getCirculationUsers());

+ 0 - 105
mec-biz/src/main/resources/config/contracts/financial2.ftl
View File 

@@ -1,105 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-<head>
 
-    <meta charset="utf-8" />
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <meta name="viewport" content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
 
-    <meta http-equiv="Pragma" content="no-cache" />
 
-    <meta http-equiv="Cache-Control" content="no-cache" />
 
-    <meta http-equiv="Expires" content="0" />
 
-    <title>费用报销单</title>
 
-    <style>
 
-        body { margin: 0; }
 
-        .container {
 
-            padding: 22px 20px 3px;
 
-            font-size: 14px;
 
-            max-width: 600px;
 
-            margin: 0 auto;
 
-        }
 
-        h1 {
 
-            font-size: 18px;
 
-            text-align: center;
 
-            margin-bottom: 8px;
 
-        }
 
-        table {
 
-            width: 100%;
 
-            border-collapse: collapse;
 
-        }
 
-        table, tr, td {
 
-            border: 1px solid #424242;
 
-        }
 
-        .title {
 
-            width: 110px;
 
-            text-align: center;
 
-        }
 
-        td {
 
-            padding: 5px;
 
-        }
 
-    </style>
 
-</head>
 
-<body style="font-family:SimSun">
 
-<div class="container">
 
-    <h1>XXX（公司全称）费用报销单</h1>
 
-    <table class="table">
 
-        <tr>
 
-            <td class="title">公司名称: </td>
 
-            <td class="concat">XXXXX </td>
 
-        </tr>
 
-        <tr>
 
-            <td class="title">费用申请人: </td>
 
-            <td class="concat">XXXXX </td>
 
-        </tr>
 
-        <tr>
 
-            <td class="title">费用类型: </td>
 
-            <td class="concat">XXXXX </td>
 
-        </tr>
 
-        <tr>
 
-            <td class="title">报销金额: </td>
 
-            <td class="concat">XXXXX </td>
 
-        </tr>
 
-        <tr>
 
-            <td class="title">是否有借款: </td>
 
-            <td class="concat">XXXXX </td>
 
-        </tr>
 
-
 
-        <tr>
 
-            <td class="title">情况说明: </td>
 
-            <td class="concat">有很多很很多很多的情况 </td>
 
-        </tr>
 
-    </table>
 
-    <table style="border-top: 0;">
 
-        <tr style="border-top: 0;">
 
-            <td style="border-top: 0;" rowspan="5" class="title">审批意见: </td>
 
-            <td class="title" style="width: 110px;border-top: 0;">分部/部门负责人: </td>
 
-            <td  style="border-top: 0;" class="concat">很多很多的情况有很多很多的情况有很多很多的情况有很多很多 </td>
 
-        </tr>
 
-        <tr>
 
-            <td class="title" style="width: 110px;">行政部: </td>
 
-            <td class="concat">很多很多的情况有很多很多的情况有很多很多的情况有很多很多 </td>
 
-        </tr>
 
-        <tr>
 
-            <td class="title" style="width: 110px;">区域会计主管: </td>
 
-            <td class="concat">很多很多的情况有很多很多的情况有很多很多的情况有很多很多 </td>
 
-        </tr>
 
-        <tr>
 
-            <td class="title" style="width: 110px;">财务经理: </td>
 
-            <td class="concat">很多很多的情况有很多很多的情况有很多很多的情况有很多很多 </td>
 
-        </tr>
 
-        <tr>
 
-            <td class="title" style="width: 110px;">董事长: </td>
 
-            <td class="concat">很多很多的情况有很多很多的情况有很多很多的情况有很多很多 </td>
 
-        </tr>
 
-
 
-        <tr>
 
-            <td rowspan="2" class="title">执行: </td>
 
-            <td class="title" style="width: 110px;">分部会计: </td>
 
-            <td class="concat">很多很多的情况有很多很多的情况有很多很多的情况有很多很多 </td>
 
-        </tr>
 
-        <tr>
 
-            <td class="title" style="width: 110px;">资金主管: </td>
 
-            <td class="concat">很多很多的情况有很多很多的情况有很多很多的情况有很多很多 </td>
 
-        </tr>
 
-    </table>
 
-</div>
 
-</body>
 
-</html>

+ 0 - 47
mec-web/src/main/java/com/ym/mec/web/controller/education/OaContractsController.java
View File 

@@ -1,6 +1,5 @@
 
 package com.ym.mec.web.controller.education;
 
 package com.ym.mec.web.controller.education;
 
 
 
-import com.ym.mec.biz.dal.dto.CirculationUser;
 
 import com.ym.mec.biz.dal.dto.OAFinancialDto;
 
 import com.ym.mec.biz.dal.dto.OAFinancialDto;
 
 import com.ym.mec.biz.service.ContractService;
 
 import com.ym.mec.biz.service.ContractService;
 
 import com.ym.mec.common.controller.BaseController;
 
 import com.ym.mec.common.controller.BaseController;
 
@@ -9,9 +8,6 @@ import io.swagger.annotations.Api;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.*;
 
 
 
-import java.util.ArrayList;
 
-import java.util.List;
 
-
 
 @RequestMapping("oaContracts")
 
 @RequestMapping("oaContracts")
 
 @Api(tags = "OA签章服务")
 
 @Api(tags = "OA签章服务")
 
 @RestController
 
 @RestController
 
@@ -22,49 +18,6 @@ public class OaContractsController extends BaseController {
 
 
 
     @PostMapping("finance")
 
     @PostMapping("finance")
 
     public HttpResponseResult<String> transferProduceContract(@RequestBody OAFinancialDto financialDto) {
 
     public HttpResponseResult<String> transferProduceContract(@RequestBody OAFinancialDto financialDto) {
 
-//        List<CirculationUser> circulationUsers = new ArrayList<>();
 
-//        CirculationUser circulationUser1 = new CirculationUser();
 
-//        circulationUser1.setUserId(100002);
 
-//        circulationUser1.setRealName("宋筠");
 
-//        circulationUser1.setPhone("13986250561");
 
-//        circulationUser1.setIdCard("420527198308075343");
 
-//        circulationUser1.setState("主管审批");
 
-//        circulationUser1.setRemark("费用无误通过");
 
-//        circulationUser1.setWorkOrderId(1);
 
-//        circulationUsers.add(circulationUser1);
 
-//
 
-//        CirculationUser circulationUser2 = new CirculationUser();
 
-//        circulationUser2.setUserId(100134);
 
-//        circulationUser2.setRealName("李志超");
 
-//        circulationUser2.setPhone("18249982421");
 
-//        circulationUser2.setIdCard("372901199202297212");
 
-//        circulationUser2.setState("经理审批");
 
-//        circulationUser2.setRemark("费用无误通过");
 
-//        circulationUser2.setWorkOrderId(1);
 
-//        circulationUsers.add(circulationUser2);
 
-//
 
-//        List<CirculationUser> executors = new ArrayList<>();
 
-//
 
-//        CirculationUser executor1 = new CirculationUser();
 
-//        executor1.setUserId(100229);
 
-//        executor1.setRealName("刘德蕊");
 
-//        executor1.setPhone("18198285631");
 
-//        executor1.setIdCard("510102196408016563");
 
-//        executor1.setState("分部会计");
 
-//        executor1.setRemark("费用无误通过");
 
-//        executor1.setWorkOrderId(1);
 
-//        executors.add(executor1);
 
-//
 
-//        CirculationUser executor2 = new CirculationUser();
 
-//        executor2.setUserId(100201);
 
-//        executor2.setRealName("蔡明哲");
 
-//        executor2.setPhone("18611812776");
 
-//        executor2.setIdCard("230204198110311914");
 
-//        executor2.setState("财务经理");
 
-//        executor2.setRemark("费用无误通过");
 
-//        executor2.setWorkOrderId(1);
 
-//        executors.add(executor2);
 
-
 
         String fileUrl = contractService.transferOaFinancial(financialDto);
 
         String fileUrl = contractService.transferOaFinancial(financialDto);
 
         return succeed(fileUrl);
 
         return succeed(fileUrl);
 
     }
 
     }