企业开票信息管理

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -69,6 +69,10 @@ public interface FinCompanyInvoicingFeign {
     public ResultBean save(@RequestBody FinCompanyInvoicingDto dto);
         
     @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySidsPath/{sid}")
+    public ResultBean delBySidsPath(@PathVariable("sid") String sid);
+
+    @ApiOperation("移动端删除")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -59,6 +59,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
         return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问");
     }
 
+    @Override
+    public ResultBean delBySidsPath(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean delBySids(String[] sids) {
         return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问");

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -564,6 +564,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
+        String contractNo = finBillApplication.getContractNo();
+        BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
+        if (data != null) {
+            variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
+        }
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@@ -574,12 +580,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //=======================================
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
-        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
-        String contractNo = finBillApplication.getContractNo();
-        BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
-        if (data != null) {
-            variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
-        }
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -2956,6 +2956,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
+        String contractNo = finBillApplication.getContractNo();
+        BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
+        if (data != null) {
+            variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
+        }
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@@ -2966,12 +2972,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //=======================================
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
-        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
-        String contractNo = finBillApplication.getContractNo();
-        BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
-        if (data != null) {
-            variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
-        }
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -75,6 +75,13 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 		return finCompanyInvoicingService.saveOrUpdateDto(dto);
 	}
 
+	@Override
+	public ResultBean delBySidsPath(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		finCompanyInvoicingService.delBySidsPath(sid);
+		return rb.success();
+	}
+
 	@Override
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -34,6 +34,8 @@ import com.yxt.anrui.fin.api.fincompanyinvoicing.*;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -65,6 +67,8 @@ import java.util.List;
 @Service
 public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInvoicingMapper, FinCompanyInvoicing> {
 
+    @Resource
+    private SysStaffOrgFeign sysStaffOrgFeign;
     @Resource
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
@@ -258,6 +262,12 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         String useOrgSid = dto.getUseOrgSid();
+        if (StringUtils.isBlank(useOrgSid)){
+            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgSidPath()).getData();
+            dto.setUseOrgSid(useOrgSid);
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+            dto.setUseOrgName(sysOrganizationVo.getName());
+        }
         String name = dto.getName();
         String taxpayerNo = dto.getTaxpayerNo();
         if (StringUtils.isBlank(dtoSid)) {//新增
@@ -317,4 +327,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
+
+    public void delBySidsPath(String sid) {
+        deleteBySid(sid);
+    }
 }