开票申请接口

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java

@@ -38,6 +38,9 @@ public enum CommonAttachTypeEnum {
     CONTRACT("0001", "合同"),
     CREDIT("0002", "人行征信"),
     INVOICE("0003", "开票申请附件"),
+    INVOICE_KHKPSQS("0003_1", "客户开票申请书"),
+    INVOICE_CLDJHT("0003_2", "车辆登记合同"),
+    INVOICE_KPXXQRS("0003_3", "开票信息确认书"),
     WITNESS("0004", "跟进记录的材料"),
     ADVANCE_GIN("0005", "提前开票附件"),
     CUSTOMER_FILE("0006", "客户资料附件"),

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -288,6 +288,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
                     scmApplyInbound.setInsideCode(vo.getInsideCode());
                     scmApplyInbound.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.TC_ORDER.getCode());
                     scmApplyInbound.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.TC_ORDER.getRemarks());
+                    scmApplyInbound.setUseOrgSid(stringResultBean.getData());
                     scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);
                 }
             }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -63,4 +64,8 @@ public interface BaseVehicleTempstateMapper extends BaseMapper<BaseVehicleTempst
 
     @Select("select * from base_vehicle_tempstate")
     List<BaseVehicleTempstateVo> selectListVo();
+
+    @Delete("delete from base_vehicle_tempstate where busSid=#{businessSid}")
+    void deleteByBusSid(@Param("businessSid") String businessSid);
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java

@@ -106,7 +106,7 @@ public class BaseVehicleTempstateService extends MybatisBaseService<BaseVehicleT
     }
 
     public void delByBusSid(String businessSid) {
-        deleteBySid(businessSid);
+        baseMapper.deleteByBusSid(businessSid);
     }
 
     public List<String> selectAll() {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@@ -84,7 +84,6 @@ public interface FinBillApplicationFeign {
     @PostMapping("/submitFinBillApplicationPageList")
     public ResultBean submitFinBillApplicationPageList(@RequestBody @Valid SubmitFinBillApplicationPageListDto dto);
 */
-
     @ApiOperation("提交开票申请审批流程")
     @PostMapping("/submitFinBillApplication")
     public ResultBean submitFinBillApplication(@RequestBody @Valid SubmitFinBillApplicationDto dto);
@@ -139,4 +138,22 @@ public interface FinBillApplicationFeign {
     @PostMapping(value = "/breakProcess")
     public ResultBean breakProcess(@Valid @RequestBody FinBillTaskQuery query);
 
+    /*************************App接口********************************/
+
+
+    @ApiOperation("移动端-获取开票申请列表")
+    @PostMapping("/getInvoicedApplyList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppBillApplicationPageVo>> getInvoicedApplyList(@RequestBody PagerQuery<AppBillApplicationPageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化 开票申请/详情")
+    @GetMapping("/getInvoicedApply/{sid}")
+    @ResponseBody
+    public ResultBean<AppBillApplicationIInfoVo> getInvoicedApply(@PathVariable("sid") String sid);
+
+    @ApiOperation("移动端-保存开票申请")
+    @PostMapping("/saveInvoicedApplyInfo")
+    @ResponseBody
+    public ResultBean saveInvoicedApplyInfo(@Valid @RequestBody AppBillApplicationIInfoDto dto);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java

@@ -110,4 +110,19 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
 	public ResultBean breakProcess(FinBillTaskQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppBillApplicationPageVo>> getInvoicedApplyList(PagerQuery<AppBillApplicationPageQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppBillApplicationIInfoVo> getInvoicedApply(String contractSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveInvoicedApplyInfo(AppBillApplicationIInfoDto dto) {
+		return null;
+	}
 }

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

@@ -26,14 +26,14 @@
 package com.yxt.anrui.fin.biz.finbillapplication;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.fin.api.finbillapplication.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
-import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
 
 import java.util.List;
 import java.util.Map;
@@ -54,15 +54,19 @@ import java.util.Map;
 @Mapper
 public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication> {
 
-	//@Update("update fin_bill_application set name=#{msg} where id=#{id}")
+    //@Update("update fin_bill_application set name=#{msg} where id=#{id}")
-	//IPage<FinBillApplicationVo> voPage(IPage<FinBillApplication> page, @Param(Constants.WRAPPER) QueryWrapper<FinBillApplication> qw);
+    //IPage<FinBillApplicationVo> voPage(IPage<FinBillApplication> page, @Param(Constants.WRAPPER) QueryWrapper<FinBillApplication> qw);
 
-	IPage<FinBillApplicationVo> selectPageVo(IPage<FinBillApplication> page, @Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
+    IPage<FinBillApplicationVo> selectPageVo(IPage<FinBillApplication> page, @Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
 
-	List<FinBillApplicationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
+    List<FinBillApplicationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinBillApplication> qw);
 
-	@Select("select * from fin_bill_application")
+    @Select("select * from fin_bill_application")
-	List<FinBillApplicationVo> selectListVo();
+    List<FinBillApplicationVo> selectListVo();
 
-	int updateFlowFiled(Map<String, Object> map);
+    int updateFlowFiled(Map<String, Object> map);
+
+    IPage<AppBillApplicationPageVo> getInvoicedApplyList(IPage<AppBillApplicationPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBillApplicationPageVo> qw);
+
+    AppBillApplicationIInfoVo getInvoicedApply(@Param("sid") String sid);
 }

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

@@ -1,33 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo">
+    <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo">
-		SELECT
+        SELECT
-		*
+        *
-		FROM
+        FROM
-		fin_bill_application fba
+        fin_bill_application fba
-		LEFT JOIN fin_bill_vehicle fbv
+        LEFT JOIN fin_bill_vehicle fbv
-		ON fba.`sid` = fbv.`billAppSid`  <where> ${ew.sqlSegment} </where>
+        ON fba.`sid` = fbv.`billAppSid`
-	</select>
+        <where>${ew.sqlSegment}</where>
+    </select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo">
+    <select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo">
-		SELECT * FROM fin_bill_application <where> ${ew.sqlSegment} </where>
+        SELECT * FROM fin_bill_application
-	</select>
+        <where>${ew.sqlSegment}</where>
+    </select>
 
-	<update id="updateFlowFiled">
+    <select id="getInvoicedApplyList"
-		UPDATE fin_bill_application
+            resultType="com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationPageVo">
-		SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        SELECT
-		<if test="procDefId != null and procDefId != ''">
+        fba.contractSid,
-			, procDefId=#{procDefId}
+        if(length(fba.nodeState) > 0, nodeState, '待提交'),
-		</if>
+        if(length(fba.nodeState) > 0, true , false ) as isShowUpData,
-		<if test="procInsId != null and procInsId != ''">
+        fba.contractNo,
-			, procInstSid=#{procInsId}
+        fba.customerName,
-		</if>
+        fba.num,
-		<if test="taskId != null and taskId != ''">
+        fba.totalBillMoney,
-			, taskId=#{taskId}
+        fba.billState,
-		</if>
+        fba.applyDate,
-		WHERE sid=#{sid}
+        fba.createBySid
+        FROM fin_bill_application fba
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="getInvoicedApply"
+            resultType="com.yxt.anrui.fin.api.finbillapplication.AppBillApplicationIInfoVo">
+        SELECT *
+        FROM fin_bill_application fba
+        WHERE fba.sid = #{sid}
+    </select>
+
+    <update id="updateFlowFiled">
+        UPDATE fin_bill_application
+        SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstSid=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid=#{sid}
     </update>
 </mapper>

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.fin.biz.finbillapplication;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.finbillapplication.*;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
@@ -33,6 +34,8 @@ import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillTaskQuery;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -61,74 +64,95 @@ import java.util.List;
 @RequestMapping("v1/finbillapplication")
 public class FinBillApplicationRest implements FinBillApplicationFeign {
 
-	@Autowired
+    @Autowired
-	private FinBillApplicationService finBillApplicationService;
+    private FinBillApplicationService finBillApplicationService;
-
+
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<FinBillApplicationVo>> listPage(@RequestBody PagerQuery<FinBillApplicationQuery> pq){
+    public ResultBean<PagerVo<FinBillApplicationVo>> listPage(@RequestBody PagerQuery<FinBillApplicationQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<FinBillApplicationVo> pv = finBillApplicationService.listPageVo(pq);
+        PagerVo<FinBillApplicationVo> pv = finBillApplicationService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("新增或修改")
+    @ApiOperation("新增或修改")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody FinBillApplicationDto dto){
+    public ResultBean save(@RequestBody FinBillApplicationDto dto) {
-		return finBillApplicationService.saveOrUpdateDto(dto);
+        return finBillApplicationService.saveOrUpdateDto(dto);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<FinBillApplicationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<FinBillApplicationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		FinBillApplicationDetailsVo vo = finBillApplicationService.fetchDetailsVoBySid(sid);
+        FinBillApplicationDetailsVo vo = finBillApplicationService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
 
 	/*@Override
 	public ResultBean submitFinBillApplicationPageList(SubmitFinBillApplicationPageListDto dto) {
 		return finBillApplicationService.submitFinBillApplicationPageList(dto);
 	}*/
 
-	@Override
+    @Override
-	public ResultBean submitFinBillApplication(SubmitFinBillApplicationDto dto) {
+    public ResultBean submitFinBillApplication(SubmitFinBillApplicationDto dto) {
-		return finBillApplicationService.submitFinBillApplication(dto);
+        return finBillApplicationService.submitFinBillApplication(dto);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean complete(FinBillCompleteDto query) {
+    public ResultBean complete(FinBillCompleteDto query) {
-		BusinessVariables bv = new BusinessVariables();
+        BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(query, bv);
+        BeanUtil.copyProperties(query, bv);
-		bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
+        bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
-		return finBillApplicationService.complete(bv);
+        return finBillApplicationService.complete(bv);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(FinBillNodeQuery query) {
+    public ResultBean<List<FinBillNodeVo>> getPreviousNodesForReject(FinBillNodeQuery query) {
-		return finBillApplicationService.getPreviousNodesForReject(query);
+        return finBillApplicationService.getPreviousNodesForReject(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(FinBillNodeQuery query) {
+    public ResultBean<List<FinBillNodeVo>> getNextNodesForSubmit(FinBillNodeQuery query) {
-		return finBillApplicationService.getNextNodesForSubmit(query);
+        return finBillApplicationService.getNextNodesForSubmit(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean taskReject(FinBillTaskQuery query) {
+    public ResultBean taskReject(FinBillTaskQuery query) {
-		return finBillApplicationService.taskReject(query);
+        return finBillApplicationService.taskReject(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean revokeProcess(FinBillTaskQuery query) {
+    public ResultBean revokeProcess(FinBillTaskQuery query) {
-		return finBillApplicationService.revokeProcess(query);
+        return finBillApplicationService.revokeProcess(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean breakProcess(FinBillTaskQuery query) {
+    public ResultBean breakProcess(FinBillTaskQuery query) {
-		return finBillApplicationService.breakProcess(query);
+        return finBillApplicationService.breakProcess(query);
-	}
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppBillApplicationPageVo>> getInvoicedApplyList(PagerQuery<AppBillApplicationPageQuery> pagerQuery) {
+        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+            new ResultBean<>().success().setMsg("用户sid不能为空");
+        }
+        PagerVo<AppBillApplicationPageVo> page = new PagerVo<>();
+        IPage<AppBillApplicationPageVo> iPage = finBillApplicationService.getInvoicedApplyList(pagerQuery);
+        PagerVo<AppBillApplicationPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppBillApplicationPageVo>>().success().setData(pagerVo);
+    }
+
+    @Override
+    public ResultBean<AppBillApplicationIInfoVo> getInvoicedApply(String sid) {
+        return finBillApplicationService.getInvoicedApply(sid);
+    }
+
+    @Override
+    public ResultBean saveInvoicedApplyInfo(AppBillApplicationIInfoDto dto) {
+        return finBillApplicationService.saveInvoicedApplyInfo(dto);
+    }
 }

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

@@ -46,6 +46,7 @@ import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillTaskQuery;
 import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublic;
 import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublicDto;
 import com.yxt.anrui.fin.api.finbillfile.FinBillFile;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileAppendxVo;
 import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
@@ -77,10 +78,13 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.bouncycastle.voms.VOMSAttribute;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.xml.crypto.Data;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -493,6 +497,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
     }
 */
+
     /**
      * 检查用户是否设置部门
      *
@@ -907,12 +912,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(ufVo,messageFlowVo);
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
             messageFlowableQuery.setModuleName("开票申请");
-            messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("业务中心");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             return voResultBean;
@@ -952,6 +957,171 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         return r;
     }
 
+    public IPage<AppBillApplicationPageVo> getInvoicedApplyList(PagerQuery<AppBillApplicationPageQuery> pagerQuery) {
+        IPage<AppBillApplicationPageQuery> page = PagerUtil.queryToPage(pagerQuery);
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        QueryWrapper<AppBillApplicationPageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
+            qw.eq("fba.useOrgSid", pagerQuery.getParams().getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
+            qw.like("fba.customerName", pagerQuery.getParams().getName());
+        }
+        IPage<AppBillApplicationPageVo> iPage = baseMapper.getInvoicedApplyList(page, qw);
+        List<AppBillApplicationPageVo> records = iPage.getRecords();
+        for (AppBillApplicationPageVo record : records) {
+            String contractSid = record.getContractSid();
+            SysUserVo data = sysUserFeign.fetchBySid(contractSid).getData();
+            record.setApplyName(data.getName());
+        }
+        return iPage;
+    }
+
+    public ResultBean<AppBillApplicationIInfoVo> getInvoicedApply(String sid) {
+        ResultBean<AppBillApplicationIInfoVo> rb = ResultBean.fireFail();
+        AppBillApplicationIInfoVo vo = baseMapper.getInvoicedApply(sid);
+        List<AppVinListVo> vinList = vo.getVinList();
+        List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
+        for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+            AppVinListVo appVinListVo = new AppVinListVo();
+            BeanUtil.copyProperties(finBillVehicleVo, appVinListVo, "sid");
+            vinList.add(appVinListVo);
+        }
+        List<String> customerInvoiceApplyImages = new ArrayList<>();
+        List<String> registerContractImages = new ArrayList<>();
+        List<String> invoiceApplyConfirmImages = new ArrayList<>();
+        List<FinBillFileAppendxVo> finBillFileAppendxVos1 = finBillFileService.fetchFileBySid(sid, CommonAttachTypeEnum.INVOICE_KHKPSQS.getAttachType());
+        for (FinBillFileAppendxVo finBillFileAppendxVo : finBillFileAppendxVos1) {
+            customerInvoiceApplyImages.add(fileUploadComponent.getUrlPrefix() + finBillFileAppendxVo.getFilePath());
+        }
+        List<FinBillFileAppendxVo> finBillFileAppendxVos2 = finBillFileService.fetchFileBySid(sid, CommonAttachTypeEnum.INVOICE_CLDJHT.getAttachType());
+        for (FinBillFileAppendxVo finBillFileAppendxVo : finBillFileAppendxVos2) {
+            registerContractImages.add(fileUploadComponent.getUrlPrefix() + finBillFileAppendxVo.getFilePath());
+        }
+        List<FinBillFileAppendxVo> finBillFileAppendxVos3 = finBillFileService.fetchFileBySid(sid, CommonAttachTypeEnum.INVOICE_KPXXQRS.getAttachType());
+        for (FinBillFileAppendxVo finBillFileAppendxVo : finBillFileAppendxVos3) {
+            invoiceApplyConfirmImages.add(fileUploadComponent.getUrlPrefix() + finBillFileAppendxVo.getFilePath());
+        }
+        vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
+        vo.setRegisterContractImages(registerContractImages);
+        vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
+        return rb.success().setData(vo);
+    }
+
+
+    public ResultBean saveInvoicedApplyInfo(AppBillApplicationIInfoDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String s1 = "";//客户开票申请书
+        String s2 = "";//车辆登记合同
+        String s3 = "";//开票信息确认书
+        String userSid = dto.getCreateBySid();//用户sid
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();//分公司sid
+        if (StringUtils.isBlank(dto.getSid())) {
+            FinBillApplication finBillApplication = new FinBillApplication();
+            BeanUtil.copyProperties(dto, finBillApplication, "sid");
+            finBillApplication.setUseOrgSid(useOrgSid);
+            String sid = finBillApplication.getSid();
+
+            List<AppVinListDto> vinList = dto.getVinList();
+            for (AppVinListDto appVinListDto : vinList) {
+                FinBillVehicle finBillVehicle = new FinBillVehicle();
+                BeanUtil.copyProperties(appVinListDto, finBillVehicle, "sid");
+                finBillVehicle.setBillAppSid(sid);
+                finBillVehicleService.save(finBillVehicle);
+            }
+
+            List<String> INVOICE_KHKPSQS = dto.getCustomerInvoiceApplyImages();
+            if (INVOICE_KHKPSQS.size() > 0) {
+                for (String invoice_khkpsqs : INVOICE_KHKPSQS) {
+                    if (invoice_khkpsqs.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        s1 = invoice_khkpsqs.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    FinBillFile finBillFile = new FinBillFile();
+                    finBillFile.setBillAppSid(sid);
+                    finBillFile.setFileType(CommonAttachTypeEnum.INVOICE_KHKPSQS.getAttachType());
+                    finBillFile.setFileUrl(s1);
+                    finBillFileService.save(finBillFile);
+                }
+            }
+            List<String> INVOICE_CLDJHT = dto.getRegisterContractImages();
+            if (INVOICE_CLDJHT.size() > 0) {
+                for (String invoice_cldjht : INVOICE_CLDJHT) {
+                    if (invoice_cldjht.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        s2 = invoice_cldjht.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    FinBillFile finBillFile = new FinBillFile();
+                    finBillFile.setBillAppSid(sid);
+                    finBillFile.setFileType(CommonAttachTypeEnum.INVOICE_CLDJHT.getAttachType());
+                    finBillFile.setFileUrl(s2);
+                    finBillFileService.save(finBillFile);
+                }
+            }
+            List<String> INVOICE_KPXXQRS = dto.getInvoiceApplyConfirmImages();
+            if (INVOICE_KPXXQRS.size() > 0) {
+                for (String invoice_kpxxqrs : INVOICE_KPXXQRS) {
+                    if (invoice_kpxxqrs.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        s3 = invoice_kpxxqrs.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    FinBillFile finBillFile = new FinBillFile();
+                    finBillFile.setBillAppSid(sid);
+                    finBillFile.setFileType(CommonAttachTypeEnum.INVOICE_KPXXQRS.getAttachType());
+                    finBillFile.setFileUrl(s3);
+                    finBillFileService.save(finBillFile);
+                }
+            }
+            save(finBillApplication);
+            return rb.success().setData(finBillApplication.getSid());
+        } else {
+            FinBillApplication finBillApplication = fetchBySid(dto.getSid());
+            BeanUtil.copyProperties(dto, finBillApplication, "sid");
+            String sid = finBillApplication.getSid();
+            finBillFileService.deleteByFinAppSid(sid);
+            List<String> INVOICE_KHKPSQS = dto.getCustomerInvoiceApplyImages();
+            if (INVOICE_KHKPSQS.size() > 0) {
+                for (String invoice_khkpsqs : INVOICE_KHKPSQS) {
+                    if (invoice_khkpsqs.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        s1 = invoice_khkpsqs.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    FinBillFile finBillFile = new FinBillFile();
+                    finBillFile.setBillAppSid(sid);
+                    finBillFile.setFileType(CommonAttachTypeEnum.INVOICE_KHKPSQS.getAttachType());
+                    finBillFile.setFileUrl(s1);
+                    finBillFileService.save(finBillFile);
+                }
+            }
+            List<String> INVOICE_CLDJHT = dto.getRegisterContractImages();
+            if (INVOICE_CLDJHT.size() > 0) {
+                for (String invoice_cldjht : INVOICE_CLDJHT) {
+                    if (invoice_cldjht.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        s2 = invoice_cldjht.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    FinBillFile finBillFile = new FinBillFile();
+                    finBillFile.setBillAppSid(sid);
+                    finBillFile.setFileType(CommonAttachTypeEnum.INVOICE_CLDJHT.getAttachType());
+                    finBillFile.setFileUrl(s2);
+                    finBillFileService.save(finBillFile);
+                }
+            }
+            List<String> INVOICE_KPXXQRS = dto.getInvoiceApplyConfirmImages();
+            if (INVOICE_KPXXQRS.size() > 0) {
+                for (String invoice_kpxxqrs : INVOICE_KPXXQRS) {
+                    if (invoice_kpxxqrs.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        s3 = invoice_kpxxqrs.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    FinBillFile finBillFile = new FinBillFile();
+                    finBillFile.setBillAppSid(sid);
+                    finBillFile.setFileType(CommonAttachTypeEnum.INVOICE_KPXXQRS.getAttachType());
+                    finBillFile.setFileUrl(s3);
+                    finBillFileService.save(finBillFile);
+                }
+            }
+            updateById(finBillApplication);
+            return rb.success().setData(finBillApplication.getSid());
+        }
+    }
+
+
    /* public ResultBean submitFinBillApplicationPageList(SubmitFinBillApplicationPageListDto dto) {
         ResultBean rb = ResultBean.fireFail();
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = fetchDetailsVoBySid(dto.getSid());

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/TemporaryExitPermitInfo.java

@@ -13,6 +13,8 @@ public class TemporaryExitPermitInfo implements Vo {
 
     @ApiModelProperty("分公司名称")
     private String orgName;
+    @ApiModelProperty("申请人")
+    private String applyName;
     @ApiModelProperty("客户名称")
     private String customerName;
     @ApiModelProperty("日期")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -725,7 +725,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid());
                 if (scmVehicleGressionVos.size() > 0) {
                     if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
-                        if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
+                        if (scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || !(scmVehicleGressionVos.get(0).getNodeState().contains("终止")) || !(scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
                             return rb.setMsg("该申请中" + vin + "已存在，请勿重复提交！");
                         }
                     }
@@ -862,12 +862,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 return rb.setMsg(resultBean.getMsg());
             }
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                VehicleGression vehicleGression = new VehicleGression();
-                List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
-                vehicleGression.setVin(list);
-                vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid());
-                vehicleGression.setLocationName(scmVehicleGression.getTargetLocation());
-                baseVehicleFeign.updateVehicleGressionByVin(vehicleGression);
                 /* String pdfPath = createPdf(bv.getBusinessSid());
                 //将生成的出门证添加到出门证表中
                ScmExitPermit scmExitPermit = new ScmExitPermit();
@@ -893,6 +887,13 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                //推送车辆台账数据
+                VehicleGression vehicleGression = new VehicleGression();
+                List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
+                vehicleGression.setVin(list);
+                vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid());
+                vehicleGression.setLocationName(scmVehicleGression.getTargetLocation());
+                baseVehicleFeign.updateVehicleGressionByVin(vehicleGression);
                 //删除申请状态
                 baseVehicleTempstateFeign.delByBusSid(bv.getBusinessSid());
                 //推送调拨单
@@ -1169,6 +1170,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         temporaryExitPermitInfo.setReason("存放地点变更");
         temporaryExitPermitInfo.setCreatName(scmVehicleGression.getOperator());
         temporaryExitPermitInfo.setCarryCarName("—");
+        temporaryExitPermitInfo.setApplyName(scmVehicleGression.getApplicantName());
         return rb.success().setData(temporaryExitPermitInfo);
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java

@@ -4,7 +4,12 @@ import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedDto;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedQuery;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.SubmitInvoicedInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.retrieval.DeliveredApplyInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.retrieval.DeliveredPageQuery;
+import com.yxt.anrui.terminal.api.autoservice.retrieval.DeliveredPageVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -24,6 +29,21 @@ import javax.validation.Valid;
         fallback = InvoicedFeignFallback.class)
 public interface InvoicedFeign {
 
+    @ApiOperation("移动端-获取开票申请列表")
+    @PostMapping("/getInvoicedApplyList")
+    @ResponseBody
+    public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(@RequestBody PagerQuery<BillApplicationPageQuery> pagerQuery);
+
+    @ApiOperation("手机端-初始化 开票申请/详情")
+    @GetMapping("/getInvoicedApply/{contractSid}")
+    @ResponseBody
+    public ResultBean<BillApplicationIInfoVo> getInvoicedApply(@PathVariable("contractSid") String contractSid);
+
+    @ApiOperation("移动端-保存开票申请")
+    @PostMapping("/saveInvoicedApplyInfo")
+    @ResponseBody
+    public ResultBean saveInvoicedApplyInfo(@Valid @RequestBody BillApplicationIInfoDto dto);
+
     @ApiOperation("提交")
     @PostMapping("/submitInvoicedInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java

@@ -1,5 +1,13 @@
 package com.yxt.anrui.terminal.api.autoservice.invoiced;
 
+import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedDto;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedQuery;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedTaskQuery;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.SubmitInvoicedInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.retrieval.DeliveredApplyInfoVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 /**
@@ -8,5 +16,49 @@ import org.springframework.stereotype.Component;
  * @Description
  */
 @Component
-public class InvoicedFeignFallback {
+public class InvoicedFeignFallback implements InvoicedFeign {
+    @Override
+    public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(PagerQuery<BillApplicationPageQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<BillApplicationIInfoVo> getInvoicedApply(String contractSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean agreeInvoicedInfo(InvoicedDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean rejectInvoicedInfo(InvoicedTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean recallInvoicedInfo(InvoicedTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean stopInvoicedInfo(InvoicedTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(InvoicedQuery query) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.terminal.biz.autoservice.invoiced;
 
-import com.yxt.anrui.terminal.api.autoservice.invoiced.InvoicedFeign;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.*;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedDto;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedQuery;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.SubmitInvoicedInfoDto;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -24,6 +26,21 @@ public class InvoicedRest implements InvoicedFeign {
     @Autowired
     private InvoicedService invoicedService;
 
+    @Override
+    public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(PagerQuery<BillApplicationPageQuery> pagerQuery) {
+        return invoicedService.getInvoicedApplyList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<BillApplicationIInfoVo> getInvoicedApply(String contractSid) {
+        return invoicedService.getInvoicedApply(contractSid);
+    }
+
+    @Override
+    public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
+        return invoicedService.saveInvoicedApplyInfo(dto);
+    }
+
     @Override
     public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
         return invoicedService.submitInvoicedInfo(dto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -2,8 +2,7 @@ package com.yxt.anrui.terminal.biz.autoservice.invoiced;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto;
-import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
+import com.yxt.anrui.fin.api.finbillapplication.*;
-import com.yxt.anrui.fin.api.finbillapplication.SubmitFinBillApplicationDto;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo;
@@ -12,11 +11,23 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExamineInfoVo;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageQuery;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationPageQuery;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationPageVo;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedDto;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedQuery;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.SubmitInvoicedInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.retrieval.DeliveredApplyInfoVo;
+import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExamineInfoVo;
+import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo;
+import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -38,6 +49,34 @@ public class InvoicedService {
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
 
+
+    public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(PagerQuery<BillApplicationPageQuery> pagerQuery) {
+        ResultBean<PagerVo<BillApplicationPageVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppBillApplicationPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppBillApplicationPageVo>> invoicedApplyList = finBillApplicationFeign.getInvoicedApplyList(pq);
+        PagerVo<BillApplicationPageVo> vo = CoverUtils.selectPagerVo(invoicedApplyList.getData());
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean<BillApplicationIInfoVo> getInvoicedApply(String contractSid) {
+        ResultBean<BillApplicationIInfoVo> rb = ResultBean.fireFail();
+        BillApplicationIInfoVo vo = new BillApplicationIInfoVo();
+        ResultBean<AppBillApplicationIInfoVo> resultBean = finBillApplicationFeign.getInvoicedApply(contractSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppBillApplicationIInfoVo appBillApplicationIInfoVo = resultBean.getData();
+        BeanUtil.copyProperties(appBillApplicationIInfoVo, vo);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
+        AppBillApplicationIInfoDto appBillApplicationIInfoDto = new AppBillApplicationIInfoDto();
+        BeanUtil.copyProperties(dto, appBillApplicationIInfoDto);
+        ResultBean resultBean = finBillApplicationFeign.saveInvoicedApplyInfo(appBillApplicationIInfoDto);
+        return resultBean;
+    }
+
     public ResultBean agreeInvoicedInfo(InvoicedDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //根据用户sid获取staffSid