Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 5 months ago
parent
commit
eda8571b10
  1. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  2. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json
  3. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java
  4. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
  5. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyFeign.java
  6. 9
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyRest.java
  7. 15
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyService.java
  8. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java
  9. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/DownloadServlet.java
  10. 26
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelDownloader.java
  11. 38
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelWriter.java
  12. 64
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProject.java
  13. 41
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectBExcelVo.java
  14. 65
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectDetailsVo.java
  15. 65
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectDto.java
  16. 44
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectKExcelVo.java
  17. 109
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java
  18. 71
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/SmsBillSettleApplyRest.java
  19. 18
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java
  20. 55
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectMapper.java
  21. 6
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectMapper.xml
  22. 57
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectRest.java
  23. 63
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectService.java

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@ -186,7 +186,8 @@
<select id="selectBySid" resultType="java.lang.String">
select bv.linkNo from bus_sales_order_vehicle bv
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
where bo.contractNo = #{contractNo} and bv.linkSid in
left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid
where bo.contractNo = #{contractNo} and bs.busState != '401' and bv.linkSid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json

@ -7,12 +7,18 @@
"FDETAILID__FF100003": {
"FNumber": "@KD_FF100003"
},
"FDETAILID__FFLEX4": {
"FNumber": "@KD_FFLEX4"
},
"FDETAILID__FFLEX5": {
"FNumber": "@KD_FFLEX5"
},
"FDETAILID__FFLEX6": {
"FNumber": "@KD_FFLEX6"
},
"FDETAILID__FFLEX8": {
"FNumber": "@KD_FFLEX8"
},
"FDETAILID__FF100002": {
"FNumber": "@KD_FF100002"
}

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java

@ -149,4 +149,12 @@ public class ScmVehRebate extends BaseEntity {
private String createOrgName; // 创建组织名称
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统")
private String purchaseSystemName;
}

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@ -372,6 +372,16 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
}
return r;
}
/**
* 推送单车返利预提凭证
* @param sid
*/
public void pushVehRebateWithVoucher(String sid) {
}
private int updateFlowFiled(Map<String, Object> beanToMap) {

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyFeign.java

@ -5,6 +5,7 @@ import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.flowable
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.flowable.AppFlowDto;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.flowable.AppFlowQuery;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.flowable.AppFlowTaskQuery;
import com.yxt.anrui.terminal.api.supplychain.vehrebatecheckapply.AppVehRebateDetailsVo;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -31,8 +32,12 @@ public interface AppCollectionRebateWithApplyFeign {
public ResultBean<AppCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("明细")
@GetMapping("/vehRebateWithDetails/{sid}")
public ResultBean<List<AppCollectionRebateDetailsVo>> vehRebateWithDetails(@PathVariable("sid") String sid);
@GetMapping("/collectionRebateWithDetails/{sid}")
public ResultBean<List<AppCollectionRebateDetailsVo>> collectionRebateWithDetails(@PathVariable("sid") String sid);
@ApiOperation("明细-详情")
@GetMapping("/scmcollectionrebateDetail/{sid}")
public ResultBean<AppCollectionRebateDetailsVo> scmcollectionrebateDetail(@PathVariable("sid") String sid);
/**********************************************流程********************************************/

9
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyRest.java

@ -49,8 +49,13 @@ public class AppCollectionRebateWithApplyRest implements AppCollectionRebateWith
}
@Override
public ResultBean<List<AppCollectionRebateDetailsVo>> vehRebateWithDetails(String sid) {
return appCollectionRebateWithApplyService.vehRebateWithDetails(sid);
public ResultBean<List<AppCollectionRebateDetailsVo>> collectionRebateWithDetails(String sid) {
return appCollectionRebateWithApplyService.collectionRebateWithDetails(sid);
}
@Override
public ResultBean<AppCollectionRebateDetailsVo> scmcollectionrebateDetail(String sid) {
return appCollectionRebateWithApplyService.scmcollectionrebateDetail(sid);
}
@Override

15
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyService.java

@ -32,6 +32,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeign;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign;
@ -39,10 +40,12 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyDelegateQuery;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.AppCollectionRebateDetailsVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.AppCollectionRebateWithApplyDetailsVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.AppCollectionRebateWithDetailsVo;
import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.flowable.*;
import com.yxt.anrui.terminal.api.supplychain.vehrebatecheckapply.AppVehRebateDetailsVo;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -61,6 +64,8 @@ public class AppCollectionRebateWithApplyService {
@Resource
private ScmCollectionRebateWithFeign scmCollectionRebateWithFeign;
@Autowired
private ScmCollectionRebateFeign scmCollectionRebateFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserFeign sysUserFeign;
@ -79,7 +84,7 @@ public class AppCollectionRebateWithApplyService {
return rb.success().setData(appCollectionRebateWithApplyDetailsVo);
}
public ResultBean<List<AppCollectionRebateDetailsVo>> vehRebateWithDetails(String sid) {
public ResultBean<List<AppCollectionRebateDetailsVo>> collectionRebateWithDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
List<AppCollectionRebateDetailsVo> appCollectionRebateDetailsVos = new ArrayList<>();
List<ScmCollectionRebateDetailsVo> data = scmCollectionRebateWithFeign.collectionRebateWithDetails(sid).getData();
@ -91,6 +96,14 @@ public class AppCollectionRebateWithApplyService {
return rb.success().setData(appCollectionRebateDetailsVos);
}
public ResultBean<AppCollectionRebateDetailsVo> scmcollectionrebateDetail(String sid) {
ResultBean rb = ResultBean.fireFail();
AppCollectionRebateDetailsVo appCollectionRebateDetailsVo = new AppCollectionRebateDetailsVo();
ScmCollectionRebateDetailsVo data = scmCollectionRebateFeign.fetchDetailsBySid(sid).getData();
BeanUtil.copyProperties(data,appCollectionRebateDetailsVo);
return rb.success().setData(appCollectionRebateDetailsVo);
}
public ResultBean agreeCreditInfo(AppFlowDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java

@ -26,12 +26,8 @@
package com.yxt.anrui.as.api.asbillsettelapply;
import com.yxt.anrui.as.api.asbusrepairbill.AitemVo;
import com.yxt.anrui.as.api.asbusrepairbill.GoodsDetailsVo;
import com.yxt.anrui.as.api.asbusrepairbill.SitemVo;
import com.yxt.anrui.as.api.utils.FileUrlQuery;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/DownloadServlet.java

@ -0,0 +1,14 @@
package com.yxt.anrui.as.api.asbusclaiminvoicebill;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
public class DownloadServlet extends HttpServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
ExcelDownloader.downloadExcelWithMultipleSheets(response);
}
}

26
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelDownloader.java

@ -0,0 +1,26 @@
package com.yxt.anrui.as.api.asbusclaiminvoicebill;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
public class ExcelDownloader {
public static void downloadExcelWithMultipleSheets(HttpServletResponse response) {
String fileName = "multi_sheet.xlsx";
String filePath = "path/to/your/excel/" + fileName;
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("Content-disposition", "attachment; filename=" + fileName);
try (InputStream is = new FileInputStream(new File(filePath));
OutputStream os = response.getOutputStream()) {
byte[] buffer = new byte[1024];
int bytesRead;
while ((bytesRead = is.read(buffer)) != -1) {
os.write(buffer, 0, bytesRead);
}
} catch (IOException e) {
e.printStackTrace();
}
}
}

38
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelWriter.java

@ -0,0 +1,38 @@
package com.yxt.anrui.as.api.asbusclaiminvoicebill;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import java.io.FileOutputStream;
import java.io.IOException;
public class ExcelWriter {
public static void writeExcelWithMultipleSheets(String fileName) {
Workbook workbook = new XSSFWorkbook();
for (int i = 0; i < 3; i++) {
Sheet sheet = workbook.createSheet("Sheet" + (i+1));
Row headerRow = sheet.createRow(0);
for (int j = 0; j < 5; j++) {
Cell cell = headerRow.createCell(j);
cell.setCellValue("Header" + (j+1));
}
for (int rownum = 1; rownum < 6; rownum++) {
Row row = sheet.createRow(rownum);
for (int cellnum = 0; cellnum < 5; cellnum++) {
Cell cell = row.createCell(cellnum);
cell.setCellValue("Data" + (rownum) + "-" + (cellnum+1));
}
}
}
try (FileOutputStream fileOut = new FileOutputStream(fileName)) {
workbook.write(fileOut);
} catch (IOException e) {
e.printStackTrace();
}
}
}

64
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProject.java

@ -0,0 +1,64 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.asbusclaiminvoicebillproject;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-as(索赔开票收入项目) <br/>
* File: AsBusclaimInvoiceBillProject.java <br/>
* Class: com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProject <br/>
* Description: 索赔单开票申请当月收入项目. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-06 14:51:42 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "索赔单开票申请当月收入项目", description = "索赔单开票申请当月收入项目")
@TableName("as_busclaim_invoice_bill_project")
public class AsBusclaimInvoiceBillProject extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("项目名称")
private String projectName; // 项目名称
@ApiModelProperty("金额")
private BigDecimal amount; // 金额
@ApiModelProperty("类别(1调增,2调减)")
private String type; // 类别(1调增,2调减)
}

41
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectBExcelVo.java

@ -0,0 +1,41 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.asbusclaiminvoicebillproject;
import com.yxt.common.core.utils.ExportEntityMap;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
@Data
public class AsBusclaimInvoiceBillProjectBExcelVo implements Vo {
@ExportEntityMap(CnName = "项目名称", EnName = "projectName")
private String projectName;
@ExportEntityMap(CnName = "金额", EnName = "amount")
private String amount;
@ExportEntityMap(CnName = "补款原因", EnName = "remarks")
private String remarks;
}

65
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectDetailsVo.java

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.asbusclaiminvoicebillproject;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-as(索赔开票收入项目) <br/>
* File: AsBusclaimInvoiceBillProjectVo.java <br/>
* Class: com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectVo <br/>
* Description: 索赔单开票申请当月收入项目 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-06 14:51:42 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "索赔单开票申请当月收入项目 视图数据详情", description = "索赔单开票申请当月收入项目 视图数据详情")
public class AsBusclaimInvoiceBillProjectDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("项目名称")
private String projectName; // 项目名称
@ApiModelProperty("金额")
private BigDecimal amount; // 金额
@ApiModelProperty("类别(1调增,2调减)")
private String type; // 类别(1调增,2调减)
private String remarks;
}

65
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectDto.java

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.asbusclaiminvoicebillproject;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-as(索赔开票收入项目) <br/>
* File: AsBusclaimInvoiceBillProjectDto.java <br/>
* Class: com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectDto <br/>
* Description: 索赔单开票申请当月收入项目 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-06 14:51:42 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "索赔单开票申请当月收入项目 数据传输对象", description = "索赔单开票申请当月收入项目 数据传输对象")
public class AsBusclaimInvoiceBillProjectDto implements Dto {
private String sid; // sid
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("项目名称")
private String projectName; // 项目名称
@ApiModelProperty("金额")
private BigDecimal amount; // 金额
@ApiModelProperty("类别(1调增,2调减)")
private String type; // 类别(1调增,2调减)
private String remarks;
}

44
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectKExcelVo.java

@ -0,0 +1,44 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.asbusclaiminvoicebillproject;
import com.yxt.common.core.utils.ExportEntityMap;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class AsBusclaimInvoiceBillProjectKExcelVo implements Vo {
@ExportEntityMap(CnName = "项目名称", EnName = "projectName")
private String projectName;
@ExportEntityMap(CnName = "金额", EnName = "amount")
private String amount;
@ExportEntityMap(CnName = "扣款原因", EnName = "remarks")
private String remarks;
}

109
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java

@ -457,6 +457,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
vo.setProcInsId(entity.getProcInstId());
vo.setInstanceId(entity.getProcInstId());
}
vo.setCreateBySid(entity.getCreateBySid());
int sourceBill = entity.getSourceBillType().intValue();
String sourceSid = entity.getSourceSid();
if (sourceBill == 0) {
@ -2387,6 +2388,114 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
return rb.success();
}
//-------------------------- 销售单流程 ---------------------------------
public ResultBean agreeCreditInfoSms(CompleteSettleDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
SettleCompleteDto completeDto = new
SettleCompleteDto();
BeanUtil.copyProperties(dto, completeDto);
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(completeDto, bv);
bv.setModelId(ProcDefEnum.SALESBILLSETTLEAPPLY.getProDefId());
ResultBean resultBean = completeSales(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectCreditInfoSms(AppSettleTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
SettleTaskQuery taskQuery = new
SettleTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = rejectSales(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean recallCreditInfoSms(AppSettleTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
SettleTaskQuery taskQuery = new
SettleTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = revokeProcessSales(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean stopCreditInfoSms(AppSettleTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
SettleTaskQuery taskQuery = new
SettleTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = breakProcessSales(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitleSms(SettleFlowableQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
SettleNodeQuery getNodeQuery = new
SettleNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<SettleNodeVo>> getPreviousNodesForReject = getPreviousNodesForRejectSales(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<SettleNodeVo>> getNextNodesForSubmit = getNextNodesForSubmitSales(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误:next");
}
return rb.success().setData(data);
}
public ResultBean delegate2Sms(AppSettleDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
SettleDelegateQuery delegateQuery1 = new
SettleDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
ResultBean delegate = delegateProcessSales(delegateQuery1);
return rb.success();
}
public AsBillSettelApplyDetailsVo busrepairbillInit(String sid, String userSid, String orgPath) {
AsBillSettelApplyDetailsVo vo = new AsBillSettelApplyDetailsVo();
//新增初始化

71
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/SmsBillSettleApplyRest.java

@ -0,0 +1,71 @@
package com.yxt.anrui.as.biz.asbillsettelapply;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleDelegateQuery;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleTaskQuery;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.CompleteSettleDto;
import com.yxt.anrui.as.api.asbillsettelapply.flow.app.SettleFlowableQuery;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@Api(tags = "销售单结算申请")
@RestController("com.yxt.anrui.as.biz.asbillsettelapply.SmsBillSettleApplyRest")
@RequestMapping("v1/smsSettleaccounts")
public class SmsBillSettleApplyRest {
@Autowired
private AsBillSettelApplyService asBillSettelApplyService;
@ApiOperation("办理")
@PutMapping("/agreeCreditInfo")
@ResponseBody
ResultBean agreeCreditInfo(@Valid @RequestBody CompleteSettleDto dto) {
return asBillSettelApplyService.agreeCreditInfoSms(dto);
}
@ApiOperation("驳回")
@PutMapping("/rejectCreditInfo")
@ResponseBody
ResultBean rejectCreditInfo(@Valid @RequestBody AppSettleTaskQuery query) {
return asBillSettelApplyService.rejectCreditInfoSms(query);
}
@ApiOperation("撤回")
@PutMapping("/recallCreditInfo")
@ResponseBody
ResultBean recallCreditInfo(@Valid @RequestBody AppSettleTaskQuery query) {
return asBillSettelApplyService.recallCreditInfoSms(query);
}
@ApiOperation("终止")
@PutMapping("/stopCreditInfo")
@ResponseBody
ResultBean stopCreditInfo(@Valid @RequestBody AppSettleTaskQuery query) {
return asBillSettelApplyService.stopCreditInfoSms(query);
}
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap SettleFlowableQuery query) {
return asBillSettelApplyService.getFlowOperateTitleSms(query);
}
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody AppSettleDelegateQuery delegateQuery) {
return asBillSettelApplyService.delegate2Sms(delegateQuery);
}
}

18
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java

@ -3,6 +3,8 @@ package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.*;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*;
import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectBExcelVo;
import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectKExcelVo;
import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery;
@ -73,15 +75,13 @@ public class AsBusclaimInvoiceBillRest {
@ApiOperation(value = "下载模板")
public void downloadExcel() {
List<AsBusclaimInvoiceBillExcelVo> list = new ArrayList<>();
//定义导出的excel名字
String excelName = "索赔单开票明细导入模板";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, list, AsBusclaimInvoiceBillExcelVo.class, response);
List<AsBusclaimInvoiceBillProjectBExcelVo> bkList = new ArrayList<>();
List<AsBusclaimInvoiceBillProjectKExcelVo> kkList = new ArrayList<>();
ExcelWriter.writeExcelWithMultipleSheets("索赔开票导入");
ExcelDownloader.downloadExcelWithMultipleSheets(response);
//ExportExcelUtils.export("开票索赔单列表", list, AsBusclaimInvoiceBillExcelVo.class, response);
//ExportExcelUtils.export("补款项目开票明细", bkList, AsBusclaimInvoiceBillProjectBExcelVo.class, response);
//ExportExcelUtils.export("扣款项目开票明细", kkList, AsBusclaimInvoiceBillProjectKExcelVo.class, response);
}
@ApiOperation(value = "导入")

55
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectMapper.java

@ -0,0 +1,55 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.biz.asbusclaiminvoicebillproject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProject;
import java.util.List;
/**
* Project: yxt-as(索赔开票收入项目) <br/>
* File: AsBusclaimInvoiceBillProjectMapper.java <br/>
* Class: com.yxt.anrui.as.biz.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectMapper <br/>
* Description: 索赔单开票申请当月收入项目. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-06 14:51:42 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface AsBusclaimInvoiceBillProjectMapper extends BaseMapper<AsBusclaimInvoiceBillProject> {
}

6
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectMapper.xml

@ -0,0 +1,6 @@
<?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.as.biz.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

57
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectRest.java

@ -0,0 +1,57 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.biz.asbusclaiminvoicebillproject;
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 io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectDetailsVo;
import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectDto;
/**
* Project: yxt-as(索赔开票收入项目) <br/>
* File: AsBusclaimInvoiceBillProjectFeignFallback.java <br/>
* Class: com.yxt.anrui.as.biz.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectRest <br/>
* Description: 索赔单开票申请当月收入项目. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-06 14:51:42 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "索赔单开票申请当月收入项目")
@RestController
@RequestMapping("v1/asbusclaiminvoicebillproject")
public class AsBusclaimInvoiceBillProjectRest {
}

63
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebillproject/AsBusclaimInvoiceBillProjectService.java

@ -0,0 +1,63 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.biz.asbusclaiminvoicebillproject;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProject;
import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectDetailsVo;
import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectDto;
import org.springframework.stereotype.Service;
/**
* Project: yxt-as(索赔开票收入项目) <br/>
* File: AsBusclaimInvoiceBillProjectService.java <br/>
* Class: com.yxt.anrui.as.biz.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectService <br/>
* Description: 索赔单开票申请当月收入项目 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-12-06 14:51:42 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AsBusclaimInvoiceBillProjectService extends MybatisBaseService<AsBusclaimInvoiceBillProjectMapper, AsBusclaimInvoiceBillProject> {
public void insertByDto(AsBusclaimInvoiceBillProjectDto dto) {
AsBusclaimInvoiceBillProject entity = new AsBusclaimInvoiceBillProject();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
}
Loading…
Cancel
Save