授权书筛选类型查询

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/EsignController.java

@@ -151,6 +151,7 @@ public class EsignController extends ApiBaseController {
             orderFile.setSignerId(signerAccountId);
             orderFile.setSignerName(sysUser.getUserName());
             orderFile.setFlowId(flowId);
+            orderFile.setTypes(2);
             orderFileService.insertOrderFile(orderFile);
             logger.info("保存签署订单附件");
             try{
@@ -339,7 +340,7 @@ public class EsignController extends ApiBaseController {
             String clientPostName=clientPost.replaceAll("1","经销商负责人").replaceAll("2","财务").replaceAll("3","仓管");
             orderFile.setEntrustPost(clientPostName);
             orderFile.setAuthType(authType);
-            orderFile.setTypes(2);
+            orderFile.setTypes(3);
             orderFile.setEntrustName(clientName);
             orderFile.setBeentrustName(trusteeName);
             orderFile.setChainsName(customerName);

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/OrderFileMapper.xml

@@ -37,36 +37,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOrderFileList" parameterType="OrderFile" resultMap="OrderFileResult">
         SELECT
-        of.order_id,
-        of.flow_id,
-        of.chains_code,
-        of.customers_code,
-        of.signer_id,
-        of.signer_name,
-        of.file_url,
-        of.create_by,
-        of.create_time,
-        of.update_by,
-        of.update_time,
-        of.is_delete,
-        of.entrust_Name,
-        of.beentrust_Name,
-        of.b_Id,
-        of.car_Number,
+        o.order_id,
+        o.flow_id,
+        o.chains_code,
+        o.customers_code,
+        o.signer_id,
+        o.signer_name,
+        o.file_url,
+        o.create_by,
+        o.create_time,
+        o.update_by,
+        o.update_time,
+        o.is_delete,
+        o.entrust_Name,
+        o.beentrust_Name,
+        o.b_Id,
+        o.car_Number,
         c.chains_name AS chainsName
         FROM
-        ssb_order_file AS of
-        LEFT JOIN (select chains_name,chains_code from customers GROUP BY chains_code ) AS c ON c.chains_code = of.chains_code
-        where of.file_url is not NULL
+        ssb_order_file AS o
+        LEFT JOIN (select chains_name,chains_code from customers GROUP BY chains_code ) AS c ON c.chains_code = o.chains_code
+        where o.file_url is not NULL
             <if test="orderId != null  and orderId != ''"> and c.chains_name = #{orderId}</if>
             <if test="chainsName != null  and chainsName != ''"> and  c.chains_name like concat('%', #{chainsName}, '%')</if>
-            <if test="signerName != null  and signerName != ''"> and  of.signer_name like concat('%', #{signerName}, '%')</if>
-            <if test="flowId != null  and flowId != ''"> and flow_id = #{flowId}</if>
-            <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
-            <if test="isDelete != null  and isDelete != ''"> and is_delete = #{isDelete}</if>
-            <if test="types != null  and types != '' and types == 1"> and types = 1</if>
-            <if test="types != null  and types != '' and types == 2"> and types is null</if>
-        order by of.create_time desc
+            <if test="signerName != null  and signerName != ''"> and  o.signer_name like concat('%', #{signerName}, '%')</if>
+            <if test="flowId != null  and flowId != ''"> and o.flow_id = #{flowId}</if>
+            <if test="fileUrl != null  and fileUrl != ''"> and o.file_url = #{fileUrl}</if>
+            <if test="isDelete != null  and isDelete != ''"> and o.is_delete = #{isDelete}</if>
+            <if test="types != null  and types != '' "> and o.types =#{types}</if>
+        <if test="authType != null  and authType != '' "> and o.auth_type =#{authType}</if>
+        order by o.create_time desc
     </select>
     
     <select id="selectOrderFileById" parameterType="String" resultMap="OrderFileResult">

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/orderfile/orderfile.html

@@ -26,6 +26,13 @@
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
+                        <li>
+                            <p>授权委托类型：</p>
+                            <select name="authType" th:with="type=${@dict.getType('wx_empower_authType')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
 
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>