Merge remote-tracking branch 'origin/1007-认证人为空时设置成admin' into release

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -186,10 +186,14 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("xfmc", xfmc);
         pramsMap.put("qsr", qsr);
         if (StringUtils.isNotBlank(rzhr)) {
-            String[] split = rzhr.split(",");
-            if (!Arrays.asList(split).contains("")) {
-                String[] split1 = rzhr.split(",");
-                pramsMap.put("rzhr", Arrays.asList(split1));
+            if("admin".equals(rzhr)){
+                pramsMap.put("rzhr", rzhr);
+            }else {
+                String[] split = rzhr.split(",");
+                if (!Arrays.asList(split).contains("")) {
+                    String[] split1 = rzhr.split(",");
+                    pramsMap.put("rzhr", Arrays.asList(split1));
+                }
             }
         }
 

dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java

@@ -159,6 +159,12 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         pageList.get(i).setInvoiceAmount(
                             AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getInvoiceAmount())));
 
+                        String rzclzt = pageList.get(i).getRzclzt();
+
+                        if(StringUtils.isEmpty(pageList.get(i).getRzr()) && "4".equals(rzclzt)){
+                            pageList.get(i).setRzr("admin");
+                        }
+
                         if (!"0".equals(pageList.get(i).getCxrzStatus())
                             && !"5".equals(pageList.get(i).getCxrzStatus())) {
                             pageList.get(i).setSelect(false);

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -155,12 +155,15 @@
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name = #{qsr}
         </if>
-        <if test="rzhr != null and rzhr != '' and rzhr != 'null'">
+        <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
             and t.confirm_user in
             <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
+        <if test="rzhr == 'admin'">
+            and (t.confirm_user = #{rzhr} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+        </if>
         <if
                 test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
             and t.invoice_no = #{invoiceNo}
@@ -433,12 +436,15 @@
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name = #{qsr}
         </if>
-        <if test="rzhr != null and rzhr != '' and rzhr != 'null'">
+        <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
             and t.confirm_user in
             <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
+        <if test="rzhr == 'admin'">
+            and (t.confirm_user = #{rzhr} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+        </if>
         <if test="paymentDateStart != null and paymentDateStart != '' and paymentDateStart != 'null' ">
             <![CDATA[ AND t.payment_date >= #{paymentDateStart} ]]>
         </if>

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java

@@ -140,6 +140,11 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                     String qsStatus = pageList.get(i).getQsStatus();
                     pageList.get(i).setQsStatus(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, qsStatus));
                     String authStatus = pageList.get(i).getAuthStatus();
+                    log.info("认证状态：{}",authStatus);
+                    String confirmUser = pageList.get(i).getConfirmUser();
+                    if(StringUtils.isEmpty(confirmUser) && "4".equals(authStatus)){
+                        pageList.get(i).setConfirmUser("admin");
+                    }
                     pageList.get(i)
                         .setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, authStatus));
                     String qsType = pageList.get(i).getQsType();
@@ -147,10 +152,8 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                     String rzhYesorno = pageList.get(i).getRzhYesorno();
                     pageList.get(i).setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
 
-                    String confirmUser = pageList.get(i).getConfirmUser();
-                    if(StringUtils.isEmpty(confirmUser) && "4".equals(auditStatus)){
-                        pageList.get(i).setConfirmUser("admin");
-                    }
+
+
                 }
             }
             // 设置记录总数

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java

@@ -1208,6 +1208,10 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                     String cxrzStatus = (String)map.get("cxrzStatus");
                     String bdkStatus = (String)map.get("bdkStatus");
                     String rzhYesorno = (String)map.get("rzhYesorno");
+                    String confirmUser = (String)map.get("confirmUser");
+                    if(StringUtils.isEmpty(confirmUser) && "4".equals(authStatus)){
+                        map.put("confirmUser","admin");
+                    }
 
                     map.put("xh", String
                         .valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));

dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml

@@ -80,9 +80,12 @@
         <if test="bdkStatus != null and bdkStatus != '' and bdkStatus != 'null' and bdkStatus != '99'">
             and t.bdk_status = #{bdkStatus}
         </if>
-        <if test="confirmUser != null and confirmUser != '' and confirmUser != 'null' ">
+        <if test="confirmUser != null and confirmUser != '' and confirmUser != 'null' and confirmUser != 'admin'">
             and t.confirm_user like CONCAT(#{confirmUser},'%')
         </if>
+        <if test="confirmUser == 'admin'">
+            and (t.confirm_user = #{confirmUser} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+        </if>
         <if test="glzt != null and glzt != '' and glzt != 'null' and glzt != '99'">
             and t.glzt = #{glzt}
         </if>
@@ -245,9 +248,12 @@
         <if test="bdkStatus != null and bdkStatus != '' and bdkStatus != 'null' and bdkStatus != '99'">
             and t.bdk_status = #{bdkStatus}
         </if>
-        <if test="confirmUser != null and confirmUser != '' and confirmUser != 'null' ">
+        <if test="confirmUser != null and confirmUser != '' and confirmUser != 'null' and confirmUser != 'admin'">
             and t.confirm_user like CONCAT(#{confirmUser},'%')
         </if>
+        <if test="confirmUser == 'admin'">
+            and (t.confirm_user = #{confirmUser} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+        </if>
         <if test="glzt != null and glzt != '' and glzt != 'null' and glzt != '99'">
             and t.glzt = #{glzt}
         </if>

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java

@@ -548,6 +548,12 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 String cxrzStatus = (String)map.get("cxrzStatus");
                 String bdkStatus = (String)map.get("bdkStatus");
                 String rzhYesorno = (String)map.get("rzhYesorno");
+                String confirmUser = (String)map.get("confirmUser");
+                String authStatus = (String)map.get("authStatus");
+
+                if(StringUtils.isEmpty(confirmUser) && "4".equals(authStatus)){
+                    map.put("confirmUser","admin");
+                }
 
                 map.put("xh",
                     String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
@@ -569,7 +575,7 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 String glzt = (String)map.get("glzt");
                 map.put("glzt", dictdetaServcice.queryDictName(DictConstant.GLZT, glzt));
                 map.put("rzhYesorno", dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
-                String authStatus = (String)map.get("authStatus");
+
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, authStatus));
                 map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));;
                 map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java

@@ -543,6 +543,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                     map.put("rzhDate", map.get("rzhDate"));
                 }
 
+                log.info("认证状态：{}",map.get("authStatus"));
+                if (StringUtils.isBlank((String) map.get("confirmUser")) && "4".equals(map.get("authStatus"))) {
+                    map.put("confirmUser","admin");
+                }
+
                 // 字典值转换
                 map.put("invoiceStatus", dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceStatus));
                 map.put("rzhYesorno", dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
@@ -609,6 +614,8 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 if (!"0".equals(cxrzStatus) && !"5".equals(cxrzStatus)) {
                     map.put("select", false);
                 }
+
+
             }
 
         }

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/customsrefund/impl/DomesticCustomsRefundServiceImpl.java

@@ -504,6 +504,11 @@ public class DomesticCustomsRefundServiceImpl extends MpBaseServiceImpl<Domestic
                     map.put("inAccountStatus","未入账");
                 }
 
+                String confirmUser = (String)map.get("confirmUser");
+                if(org.apache.commons.lang.StringUtils.isEmpty(confirmUser) && "4".equals(authStatus)){
+                    map.put("confirmUser","admin");
+                }
+
                 if (map.get("fillInDate") != null) {
                     map.put("fillInDate", map.get("fillInDate"));
                 }

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java

@@ -364,6 +364,10 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
             }else {
                 result.setInAccountStatus("未入账");
             }
+            String authenticationPerson = result.getAuthenticationPerson();
+            if(StringUtils.isEmpty(authenticationPerson) && "4".equals(result.getAuthenticationStatus())){
+                result.setAuthenticationPerson("admin");
+            }
         });
         if (dto.getCurrentPage() == 1) {
             QuerySummaryDTO querySummaryDTO = domesticRecordInvoiceDao.selectTotalAmountByAuthenticationCheck(dto);

dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml

@@ -376,10 +376,14 @@
             and p.export_no = #{queryParams.exportNo}
         </if>
 
-        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!=''">
+        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!='' and queryParams.confirmUser != 'admin'">
             and p.confirm_user = #{queryParams.confirmUser}
         </if>
 
+        <if test="queryParams.confirmUser == 'admin'">
+            and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4'
+        </if>
+
         <if test="queryParams.invoiceType!=null and queryParams.invoiceType!=''">
             and p.invoice_type = #{queryParams.invoiceType}
         </if>
@@ -454,10 +458,14 @@
             and p.export_no = #{queryParams.exportNo}
         </if>
 
-        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!=''">
+        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!='' and queryParams.confirmUser != 'admin'">
             and p.confirm_user = #{queryParams.confirmUser}
         </if>
 
+        <if test="queryParams.confirmUser == 'admin'">
+            and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4'
+        </if>
+
         <if test="queryParams.invoiceType!=null and queryParams.invoiceType!=''">
             and p.invoice_type = #{queryParams.invoiceType}
         </if>
@@ -1110,10 +1118,14 @@
             and p.export_no = #{queryParams.exportNo}
         </if>
 
-        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!=''">
+        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!='' and queryParams.confirmUser != 'admin'">
             and p.confirm_user = #{queryParams.confirmUser}
         </if>
 
+        <if test="queryParams.confirmUser == 'admin'">
+            and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4'
+        </if>
+
         <if test="queryParams.invoiceType!=null and queryParams.invoiceType!=''">
             and p.invoice_type = #{queryParams.invoiceType}
         </if>

dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml

@@ -140,8 +140,17 @@
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name = #{qsr}
         </if>
+
+
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
-            and t.confirm_user like CONCAT(#{rzhr},'%')
+            <choose>
+                <when test="rzhr = 'admin'">
+                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+                </when>
+                <otherwise>
+                    and t.confirm_user like CONCAT(#{rzhr},'%')
+                </otherwise>
+            </choose>
         </if>
         <if test="settlementNo != null and settlementNo != ''">
             and t.settlement_no like concat(#{settlementNo},'%')
@@ -403,7 +412,14 @@
             and t.qs_name = #{qsr}
         </if>
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
-            and t.confirm_user like CONCAT(#{rzhr},'%')
+            <choose>
+                <when test="rzhr = 'admin'">
+                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+                </when>
+                <otherwise>
+                    and t.confirm_user like CONCAT(#{rzhr},'%')
+                </otherwise>
+            </choose>
         </if>
         <if test="glzt != null and glzt != '' and glzt != 'null' and glzt != '99'">
             and t.glzt = #{glzt}