购方税号和组织编码修改

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

@@ -121,6 +121,9 @@ public class BaseInvoiceController extends AbstractController {
     public Object listRzFpxx(@RequestBody Map<String, Object> map) {
         String gfsh = (String)map.get("gfsh");
         String companyCode = (String) map.get("companyCode");
+        if (StringUtils.isBlank(gfsh)||StringUtils.isBlank(companyCode)){
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
+        }
         String invoiceType = (String)map.get("invoiceType");
         String invoiceSource = (String)map.get("invoiceSource");
         String kpksrq = (String)map.get("kpksrq");
@@ -219,38 +222,11 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("voucherNumber", map.get("voucherNumber"));
         List<Tax> taxList = getUserInfo().getOrg();
         pramsMap.put("taxList", taxList);
-        if (!StringUtils.isNotBlank(gfsh)){
-            pramsMap.put("sign","88");
-        }
-        List<String> gfshList = new ArrayList<>();
-        if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
-            gfshList.add(gfsh);
-        } else {
-//            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
-            gfshList = getGfshList(gfshList,getUserInfo().getCompanyCodes());
-        }
-        pramsMap.put("gfsh", gfshList);
 
-        boolean flag = checkList(gfshList);
+        pramsMap.put("gfsh", gfsh);
+
+        pramsMap.put("companyCode",companyCode);
 
-        if (flag){
-            pramsMap.put("sign","88");
-            log.info("登陆账号无税号");
-        }
-        //所属组织
-//        List<String> companyCodeList = new ArrayList<>();
-//        if (StringUtils.isNotBlank(companyCode)){
-//            companyCodeList.add(companyCode);
-//        }else {
-//            companyCodeList = getUserInfo().getCompanyCodes();
-//        }
-        if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){
-            pramsMap.put("companyCodes",getUserInfo().getCompanyCodes());
-            log.info("组织机构====>{}",pramsMap.get("companyCodes"));
-        }
-        if (StringUtils.isNotBlank(companyCode)){
-            pramsMap.put("companyCode",companyCode);
-        }
 
         if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
 //            List<String> rates = new ArrayList<>();

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

@@ -20,6 +20,7 @@ import com.dxhy.common.vo.Tax;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -63,7 +64,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
             String menuId = (String)pramsMap.get("menuId");
             json = tabulateRedisService.getTabulateMenu(company, menuId);
             // 合计信息,仅第一页时需要统计，减少数据库压力
-            List<String> gfshList = (List<String>)pramsMap.get("gfsh");
+            String gfsh = (String) pramsMap.get("gfsh");
 //            log.info("购方税号{}",gfshList != null && !gfshList.isEmpty());
             List<Tax> taxList = (List<Tax>)pramsMap.get("taxList");
             List<String> orgList = new ArrayList<>();
@@ -75,7 +76,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
             }
             log.info("orgList======>{}",orgList);
 
-            if (gfshList.size() == 0) {
+            if (StringUtils.isBlank(gfsh)) {
                 // 未从getUserInfo()获取到购方税号信息
                 json.put("hjsl", "0");
                 json.put("hjje", "0");

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -192,8 +192,6 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                             AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getTaxAmount().toString())));
                     vo.setInvoiceStatus(dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, pageList.get(i).getInvoiceStatus()));
                     vo.setInvoiceType(pageList.get(i).getInvoiceType());
-                    //报账单号和入账状态
-//                    vo.setInAccountStatus(pageList.get(i).getInvoiceStatus());
                     vo.setBzdh(pageList.get(i).getBzdh());
                     vo.setCompCode(pageList.get(i).getCompCode());
                     // 签收方式为已经签收时展示签收信息

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

@@ -371,32 +371,13 @@
         select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
+        and t.gf_tax_no = #{gfsh}
+        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         and t.invoice_type in('01','03','08','14','31','283','161','183','185')
         and t.auth_status in ('2','3','4')
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.company =#{company}
-        <if test="sign != '88'">
-            and t.gf_tax_no in
-            <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-
-        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (t.comp_code in
-            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
-                #{companyCode}
-            </foreach>
-            or t.comp_code is null or t.comp_code = ''
-            )
-        </if>
-        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
-            and t.comp_code = #{companyCode}
-        </if>
-        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
-            and (t.comp_code = '' or t.comp_code is null)
-        </if>
         <if  test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>