Ver Fonte

修改OA签章标识未,userid

river há 4 anos atrás
pai
commit
a3c9eee397

+ 1 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/ContractService.java

@@ -135,8 +135,7 @@ public interface ContractService {
 
 	/**
 	 * OA财务审批的签章
-	 * @param circulationUsers 审批人
-	 * @param executors 执行人
+	 * @param financialDto
 	 * @return
 	 */
 	String transferOaFinancial(OAFinancialDto financialDto);

Diff do ficheiro suprimidas por serem muito extensas
+ 988 - 988
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java


+ 3 - 3
mec-biz/src/main/resources/config/contracts/financial.ftl

@@ -84,12 +84,12 @@
                 <tr style="border-top: 0;">
                     <td style="border-top: 0;" rowspan="${circulationUsers?size}" class="title">审批意见:</td>
                     <td class="title" style="width: 110px;border-top: 0;">${circulationUser.state!}:</td>
-                    <td style="border-top: 0;" class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.realName!}</span></td>
+                    <td style="border-top: 0;" class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId!}</span></td>
                 </tr>
             <#else>
                 <tr>
                     <td class="title" style="width: 110px;">${circulationUser.state!}:</td>
-                    <td class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.realName!}</span></td>
+                    <td class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId!}</span></td>
                 </tr>
             </#if>
         </#list>
@@ -99,7 +99,7 @@
                     <td rowspan="${executors?size}" class="title">执行:</td>
                 </#if>
                 <td class="title" style="width: 110px;">${executor.state!}:</td>
-                <td class="concat">${executor.remarks!}<span style="color: #ffffff;">${executor.realName!}</span></td>
+                <td class="concat">${executor.remarks!}<span style="color: #ffffff;">${executor.userId!}</span></td>
             </tr>
         </#list>
     </table>

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff