Browse Source

问题修改

master
God 2 years ago
parent
commit
b59ba42d1f
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
  2. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
  3. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  4. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
  5. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java
  6. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  7. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@ -60,7 +60,7 @@ public interface BaseVehicleOutFeign {
@PostMapping("/exportExcel") @PostMapping("/exportExcel")
@ApiOperation(value = "车辆销售台账列表导出") @ApiOperation(value = "车辆销售台账列表导出")
@ResponseBody @ResponseBody
public void exportExcel(@RequestBody String[] sids); public void exportExcel(@RequestBody BaseVehicleOutQuery baseVehicleOutQuery);
} }

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@ -72,9 +72,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
} }
@Override @Override
public void exportExcel(String[] sids) { public void exportExcel(BaseVehicleOutQuery baseVehicleOutQuery) {
//得到所有要导出的数据 //得到所有要导出的数据
List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = baseVehicleOutService.listExcel(sids); List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = baseVehicleOutService.listExcel(baseVehicleOutQuery);
//定义导出的excel名字 //定义导出的excel名字
String excelName = "车辆销售台账管理列表"; String excelName = "车辆销售台账管理列表";
String fileNameURL = ""; String fileNameURL = "";

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -1122,15 +1122,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
return rb.success(); return rb.success();
} }
public List<BaseVehicleOutVoExecl> listExcel(String[] sids) { public List<BaseVehicleOutVoExecl> listExcel(BaseVehicleOutQuery baseVehicleOutQuery) {
List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = new ArrayList<>(); List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = new ArrayList<>();
int id = 1; /*BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(baseVehicleOutQuery);
for (String sid : sids) { baseVehicleOutVoExecl.setRankNo(id);
BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(sid); baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);*/
baseVehicleOutVoExecl.setRankNo(id);
id = id + 1;
baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);
}
return baseVehicleOutVoExecls; return baseVehicleOutVoExecls;
} }
} }

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@ -134,4 +134,6 @@ public class FinCollectionConfirmation extends BaseEntity {
private String staffDeptName; private String staffDeptName;
@ApiModelProperty("销售专员部门sid") @ApiModelProperty("销售专员部门sid")
private String staffDeptSid; private String staffDeptSid;
@ApiModelProperty("下载次数")
private String downNum; // 下载次数
} }

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java

@ -92,4 +92,6 @@ public class FinCollectionConfirmationVo implements Vo {
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; private String billNo;
@ApiModelProperty("下载次数")
private String downNum; // 下载次数
} }

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@ -113,4 +113,7 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
String selectNum(String bill); String selectNum(String bill);
int updateVin(@Param("vinNo") String vinNo, @Param("contractNo") String contractNo, @Param("temporaryNo") String temporaryNo); int updateVin(@Param("vinNo") String vinNo, @Param("contractNo") String contractNo, @Param("temporaryNo") String temporaryNo);
@Update("update fin_collection_confirmation set downNum = #{downNum} where sid = #{skdSid}")
void updateDown(@Param("skdSid") String skdSid,@Param("downNum") String downNum);
} }

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -2043,6 +2043,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String pdfName = "收款单_" + dateStr + seconds + ".pdf"; String pdfName = "收款单_" + dateStr + seconds + ".pdf";
WordUtils.doc2pdf(wordPath, targetPath, pdfName, ""); WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName); pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
String downNum = finCollectionConfirmationDetailsVo.getDownNum();
if (StringUtils.isBlank(downNum)){
downNum = "1";
}else {
downNum = String.valueOf((Integer.parseInt(downNum) + 1));
}
baseMapper.updateDown(skdSid,downNum);
return rb.success().setData(pdfPath); return rb.success().setData(pdfPath);
} }

Loading…
Cancel
Save