Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle

atms-api/src/main/java/pwc/taxtech/atms/vat/dao/InputInvoiceDao.java

@@ -34,11 +34,11 @@ public class InputInvoiceDao {
         }
 
         if (StringUtils.isNotBlank(notPass)) {
-            String unPass = "1";
+            String unPass = "2";
             criteria.andRZJGEqualTo(unPass);
 //            criteria1.andRZJGEqualTo(unPass);
         } else if (StringUtils.isNotBlank(checkPass) && StringUtils.isNotBlank(scanPass)) {
-            String pass = "0";
+            String pass = "1";
             criteria.andRZJGEqualTo(pass);
 //            criteria1.andRZJGEqualTo(pass);
 //            example.or(criteria1);

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/JXFP.java

@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
 /// </summary>
 /// <param name="certificationPeriod">认证期间：“0”当期（当月），“-99”前期（当月之前所有月份，不含当月），"99"所有认证期间</param>
 /// <param name="invoiceType">“1”增值税专票，“2”货运发票，“3”机动车发票，“4”农产品发票，“5”其他发票（包括空值）</param>
-/// <param name="authenticationType">认证结果：“1”认证通过；“0”认证未通过；“2”未认证</param>
+/// <param name="authenticationType">认证结果：“1”认证通过；“2”未认证</param>“0”认证未通过；
 /// <param name="resultType">计算取值：“0”金额；“1”税额；“2”份数；</param>
 /// <param name="period">会计期间——“0”当期，1-12为自然月</param>
 /// <returns></returns>
@@ -95,7 +95,7 @@ public class JXFP extends FunctionBase implements FreeRefFunction {
                     null);
         }
         // 认证未通过与未认证暂认为是同一个意思
-        else if ((authenticationType == 1 || authenticationType == 2) && formulaContext.getIsYear()) {
+        else if (authenticationType == 2 && formulaContext.getIsYear()) {
             inputInvoices = SpringContextUtil.inputInvoiceDao.getInputInvoice(null, invoiceType,
                     null, null, Constant.InputInvoiceCertificationResult.NotPass);
         }

atms-web/src/main/webapp/WEB-INF/templates/logon.html

@@ -34,9 +34,9 @@
                         <div class="form-group">
                             <input id="loginFullPwd" name="loginFullPwd" type="password" placeholder="密码" class="form-control-customer" />
                         </div>
-                        <div class="form-group">
-                            <a href="javascript:void(0)" id="btnShowForgotPwd" rel="forgot_password" class="form-forget-password">忘记密码?</a>
-                        </div>
+                        <!--<div class="form-group">-->
+                            <!--<a href="javascript:void(0)" id="btnShowForgotPwd" rel="forgot_password" class="form-forget-password">忘记密码?</a>-->
+                        <!--</div>-->
                     </div>
                     <div class="button-wrapper">
                         <button id="btnFullLogin" class="btn-customer btn-customer-lg login-button" type="button" tabindex="0">登录</button>

atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js

@@ -811,7 +811,7 @@
                         },
                         {
                             calculateCellValue: function(){
-                                return 'WPSR';
+                                return '无票收入';
                             },
                             // dataField: 'type',
                             caption: $translate.instant('类型'),