yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 11 months ago
parent
c5ca34b13f 86c6520045
commit
669c40b9f4
13 changed files with 232 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 9
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
  3. 10
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
  4. 11
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
  5. 76
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  6. 106
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
  7. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java
  8. 5
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java
  9. 5
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java
  10. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java
  11. 37
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
  12. 1
      yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java
  13. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -166,6 +166,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUser;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
@ -2161,8 +2162,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
QueryWrapper<BusSalesOrder> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getUserSid())) {
SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUserVo.getMobile()).getData();
SysUser sysUser = sysUserFeign.fetchBySidWx(query.getUserSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUser.getMobile()).getData();
qw.eq("bo.customerSid", crmCustomerTempVo.getSid());
}
qw.eq("bo.nodeState", "已办结");

9
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
View File

@ -160,6 +160,10 @@ public interface CrmCustomerTempFeign {
@PostMapping("/saveOrUpdateAppCustomerTemp")
public ResultBean<String> saveOrUpdateAppCustomerTemp(@Valid @RequestBody AppCrmCustomerTempDto dto);
@ApiOperation("小程序保存/修改潜在客户信息")
@PostMapping("/saveOrUpdateAppCustomerTempWx")
public ResultBean saveOrUpdateAppCustomerTempWx(@Valid @RequestBody AppCrmCustomerTempDto dto);
@ApiOperation("手机端维护客户信息是否完善的状态")
@ResponseBody
@GetMapping("/getAppCrmCustomerTempMaintainState")
@ -182,6 +186,11 @@ public interface CrmCustomerTempFeign {
@GetMapping("/customerTempDetailsBySid/{sid}")
public ResultBean<AppCrmCustomerTempBasicsDetailsVo> customerTempDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("小程序客户信息维护详情")
@ResponseBody
@GetMapping("/customerTempDetailsBySidWx/{sid}")
public ResultBean<AppCrmCustomerTempBasicsDetailsVo> customerTempDetailsBySidWx(@PathVariable("sid") String sid);
@ApiOperation("初始化客户详情")
@ResponseBody
@GetMapping("/getAppCustomerTempDetails")

10
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
View File

@ -110,6 +110,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
return rb.setMsg("接口anrui-crm/crmcustomertemp/saveOrUpdateAppCustomerTemp无法访问");
}
@Override
public ResultBean saveOrUpdateAppCustomerTempWx(AppCrmCustomerTempDto dto) {
return null;
}
@Override
public ResultBean<AppCrmCustomerTempMaintainStateVo> getAppCrmCustomerTempMaintainState(String sid, String userSid) {
return null;
@ -140,6 +145,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
return null;
}
@Override
public ResultBean<AppCrmCustomerTempBasicsDetailsVo> customerTempDetailsBySidWx(String sid) {
return null;
}
@Override
public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
return null;

11
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
View File

@ -217,6 +217,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
return crmCustomerTempService.saveOrUpdateAppCustomerTemp(dto);
}
@Override
public ResultBean saveOrUpdateAppCustomerTempWx(AppCrmCustomerTempDto dto) {
return crmCustomerTempService.saveOrUpdateAppCustomerTempWx(dto);
}
/**
* 手机端维护客户信息是否完善的状态
*
@ -301,6 +306,12 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
return new ResultBean<AppCrmCustomerTempBasicsDetailsVo>().success().setData(vo);
}
@Override
public ResultBean<AppCrmCustomerTempBasicsDetailsVo> customerTempDetailsBySidWx(String sid) {
AppCrmCustomerTempBasicsDetailsVo vo = crmCustomerTempService.customerTempDetailsBySidWx(sid);
return new ResultBean<AppCrmCustomerTempBasicsDetailsVo>().success().setData(vo);
}
/**
* 初始化客户档案信息
*

76
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
View File

@ -127,6 +127,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
private CrmCustomerOrgLinkService crmCustomerOrgLinkService;
@Autowired
private CrmCustomerOrgService crmCustomerOrgService;
public PagerVo<CrmCustomerTemp> listPage(PagerQuery<CrmCustomerTempQuery> pq) {
CrmCustomerTempQuery query = pq.getParams();
QueryWrapper<CrmCustomerTemp> qw = createQueryWrapper(query);
@ -372,6 +373,53 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
return rb.success().setData(sid);
}
public ResultBean saveOrUpdateAppCustomerTempWx(AppCrmCustomerTempDto dto) {
ResultBean rb = ResultBean.fireFail();
/**
* 2023-02-10:
* 先查询客户编码是否存在：
* 1、存在
* 1.1、是否是当前用户的客户：
* 1.1.1、是,提示客户已存在，不能新增
* 1.1.2、否,提示：为xxx销售专员客户
* 2、不存在
* 2.1、新增客户信息（新增跟进记录），保存时添加二次提醒：保存后客户名称、手机号码将不能修改
*/
//根据用户sid获取业务员信息
SysUser sysUser = sysUserFeign.fetchBySidWx(dto.getUserSid()).getData();
if (sysUser == null) {
return rb.setMsg("该用户不存在");
}
CrmCustomerTempVo crmCustomerTempVo = baseMapper.selByMobile(sysUser.getMobile());
CrmCustomerTemp customerTemp = fetchBySid(crmCustomerTempVo.getSid());
if (customerTemp == null) {
return rb.setMsg("该客户不存在");
}
//对比客户名称以及手机号是否变化
if (!customerTemp.getName().equals(dto.getName())) {
return rb.setMsg("客户名称不允许修改");
}
if (!customerTemp.getMobile().equals(dto.getMobile())) {
return rb.setMsg("客户手机号不允许修改");
}
BeanUtil.copyProperties(dto, customerTemp, "sid");
String adCode = dto.getAdCode();
if (StringUtils.isNotBlank(adCode)) {
customerTemp.setAddress_province(adCode.substring(0, 2));
customerTemp.setAddress_city(adCode.substring(2, 4));
customerTemp.setAddress_county(adCode.substring(4, 6));
}
if (StringUtils.isNotBlank(customerTemp.getCustomerPhoto())) {
customerTemp.setCustomerPhoto(customerTemp.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
}
customerTemp.setUpdateBySid(dto.getUserSid());
boolean updateBoolean = updateById(customerTemp);
if (!updateBoolean) {
return rb.fail().setMsg("更新失败");
}
return rb.success();
}
/**
* 生成潜在客户编号
*
@ -1008,7 +1056,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
}
baseMapper.updateById(customerTemp);
if (StringUtils.isNotBlank(dto.getCustomerOrgSid())) {
crmCustomerOrgLinkService.saveOrgLink(sid,dto.getCustomerOrgSid());
crmCustomerOrgLinkService.saveOrgLink(sid, dto.getCustomerOrgSid());
}
//更新运营信息
CrmBusinessDto crmBusinessDto = dto.getCrmBusinessDto();
@ -1046,6 +1094,32 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
return vo;
}
public AppCrmCustomerTempBasicsDetailsVo customerTempDetailsBySidWx(String sid) {
SysUser sysUser = sysUserFeign.fetchBySidWx(sid).getData();
CrmCustomerTempVo crmCustomerTempVo = baseMapper.selByMobile(sysUser.getMobile());
AppCrmCustomerTempBasicsDetailsVo vo = baseMapper.customerTempDetailsBySid(crmCustomerTempVo.getSid());
vo.setSid(sid);
String adCode = vo.getAddress_province() + vo.getAddress_city() + vo.getAddress_county();
if (StringUtils.isNotBlank(adCode)) {
vo.setAdCode(adCode);
} else {
vo.setAdCode("");
}
String type = "customerType";
DictCommonVo customerType = dictCommonFeign.selectBykey(vo.getCustomerTypeKey(), type).getData();
vo.setParentSid(customerType.getSid());
List<CrmFileDetailsVo> crmFileDetailsVos = crmFileService.fetchByLinkSid(sid);
List<String> list = new ArrayList<>();
if (crmFileDetailsVos != null) {
for (CrmFileDetailsVo crmFileDetailsVo : crmFileDetailsVos) {
String filePath = crmFileDetailsVo.getFilePath();
list.add(fileUploadComponent.getUrlPrefix() + filePath);
}
}
vo.setCrmVisitFileList(list);
return vo;
}
public CrmCustomerTempVo selByMobile(String mobile) {
return baseMapper.selByMobile(mobile);
}

106
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
View File

@ -6026,13 +6026,18 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
//垫款金额、垫资方逾期利息
D1 = T1.compareTo(m1i) >= 0 ? m1i : T1;
BigDecimal L1 = BigDecimal.ZERO;
if (D1.compareTo(T) >= 0) {
L1 = L;
if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) {
L1 = TempL;
} else {
BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP);
L1 = L.multiply(bigDecimal);
if (D1.compareTo(T) >= 0) {
L1 = L;
} else {
BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP);
L1 = L.multiply(bigDecimal);
}
}
T1 = T1.subtract(D1);
TempL = TempL.subtract(L1);
p.setPaymentInterest(L1);
p.setOverdue(0);
p.setPaymentMoney(D1);
@ -6054,12 +6059,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
//资金占用费
temp = Q1.compareTo(m1i) >= 0 ? m1i : Q1;
BigDecimal B1 = BigDecimal.ZERO;
if (temp.compareTo(Q) >= 0) {
B1 = B;
if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) {
B1 = TempB;
} else {
BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP);
B1 = B.multiply(bigDecimal);
if (temp.compareTo(Q) >= 0) {
B1 = B;
} else {
BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP);
B1 = B.multiply(bigDecimal);
}
}
TempB = TempB.subtract(B1);
if (Q1.compareTo(m1i) < 0) {
//生成 i 期还款记录，月还金额 m1i - Q1
LoanRepaymentHistory history = new LoanRepaymentHistory();
@ -6134,12 +6144,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
//垫款金额、垫资方逾期利息
D1 = T1.compareTo(m2i) >= 0 ? m2i : T1;
BigDecimal L1 = BigDecimal.ZERO;
if (D1.compareTo(T) >= 0) {
L1 = L;
if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) {
L1 = TempL;
} else {
BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP);
L1 = L.multiply(bigDecimal);
if (D1.compareTo(T) >= 0) {
L1 = L;
} else {
BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP);
L1 = L.multiply(bigDecimal);
}
}
TempL = TempL.subtract(L1);
T1 = T1.subtract(D1);
p.setPaymentInterest(L1);
p.setOverdue(0);
@ -6162,12 +6177,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
//资金占用费
temp = Q1.compareTo(m2i) >= 0 ? m2i : Q1;
BigDecimal B1 = BigDecimal.ZERO;
if (temp.compareTo(Q) >= 0) {
B1 = B;
if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) {
B1 = TempB;
} else {
BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP);
B1 = B.multiply(bigDecimal);
if (temp.compareTo(Q) >= 0) {
B1 = B;
} else {
BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP);
B1 = B.multiply(bigDecimal);
}
}
TempB = TempB.subtract(B1);
if (Q1.compareTo(m2i) < 0) {
//生成 i 期还款记录，月还金额 m1i - Q1
LoanRepaymentHistory history = new LoanRepaymentHistory();
@ -6355,12 +6375,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
//垫款金额、垫资方逾期利息
D1 = T1.compareTo(m1i) >= 0 ? m1i : T1;
BigDecimal L1 = BigDecimal.ZERO;
if (D1.compareTo(T) >= 0) {
L1 = L;
if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) {
L1 = TempL;
} else {
BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP);
L1 = L.multiply(bigDecimal);
if (D1.compareTo(T) >= 0) {
L1 = L;
} else {
BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP);
L1 = L.multiply(bigDecimal);
}
}
TempL = TempL.subtract(L1);
T1 = T1.subtract(D1);
p.setPaymentInterest(L1);
p.setOverdue(0);
@ -6383,12 +6408,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
//资金占用费
temp = Q1.compareTo(m1i) >= 0 ? m1i : Q1;
BigDecimal B1 = BigDecimal.ZERO;
if (temp.compareTo(Q) >= 0) {
B1 = B;
if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) {
B1 = TempB;
} else {
BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP);
B1 = B.multiply(bigDecimal);
if (temp.compareTo(Q) >= 0) {
B1 = B;
} else {
BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP);
B1 = B.multiply(bigDecimal);
}
}
TempB = TempB.subtract(B1);
if (Q1.compareTo(m1i) < 0) {
//生成 i 期还款记录，月还金额 m1i - Q1
LoanRepaymentHistory history = new LoanRepaymentHistory();
@ -6463,12 +6493,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
//垫款金额、垫资方逾期利息
D1 = T1.compareTo(m2i) >= 0 ? m2i : T1;
BigDecimal L1 = BigDecimal.ZERO;
if (D1.compareTo(T) >= 0) {
L1 = L;
} else {
BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP);
L1 = L.multiply(bigDecimal);
if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) {
L1 = TempL;
} else {
if (D1.compareTo(T) >= 0) {
L1 = L;
} else {
BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP);
L1 = L.multiply(bigDecimal);
}
}
TempL = TempL.subtract(L1);
T1 = T1.subtract(D1);
p.setPaymentInterest(L1);
p.setOverdue(0);
@ -6491,12 +6526,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
//资金占用费
temp = Q1.compareTo(m2i) >= 0 ? m2i : Q1;
BigDecimal B1 = BigDecimal.ZERO;
if (temp.compareTo(Q) >= 0) {
B1 = B;
if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) {
B1 = TempB;
} else {
BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP);
B1 = B.multiply(bigDecimal);
if (temp.compareTo(Q) >= 0) {
B1 = B;
} else {
BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP);
B1 = B.multiply(bigDecimal);
}
}
TempB = TempB.subtract(B1);
if (Q1.compareTo(m2i) < 0) {
//生成 i 期还款记录，月还金额 m1i - Q1
LoanRepaymentHistory history = new LoanRepaymentHistory();

3
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java
View File

@ -125,5 +125,6 @@ public class AsBusrepairBill extends BaseEntity {
private String rescueRemarks;
@ApiModelProperty("外出费备注")
private String outRemarks;
@ApiModelProperty("商品登记备注")
private String registerRemarks;
}

5
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java
View File

@ -1,5 +1,6 @@
package com.yxt.anrui.as.api.asbusrepairbill;
import com.yxt.anrui.as.api.utils.FileUrlQuery;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -157,5 +158,7 @@ public class AsBusrepairBillDetailsVo implements Vo {
private String outRemarks;
@ApiModelProperty("施救费")
private String rescueAmount;
private String fileName; //文件名称
private List<FileUrlQuery> fileName = new ArrayList<>(); //文件名称
@ApiModelProperty("商品登记备注")
private String registerRemarks;
}

5
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java
View File

@ -1,5 +1,6 @@
package com.yxt.anrui.as.api.asbusrepairbill;
import com.yxt.anrui.as.api.utils.FileUrlQuery;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -141,5 +142,7 @@ public class AsBusrepairBillDto implements Dto {
private String outRemarks;
@ApiModelProperty("施救费")
private String rescueAmount;
private String fileName; //文件名称
private List<FileUrlQuery> fileName = new ArrayList<>(); //文件名称
@ApiModelProperty("商品登记备注")
private String registerRemarks;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java
View File

@ -12,5 +12,7 @@ import lombok.Data;
public class FileUrlQuery {
@ApiModelProperty("附件路径")
private String url; // 附件路径
@ApiModelProperty("附件名称")
private String name; // 附件路径
}

37
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asappendix.AsAppendix;
import com.yxt.anrui.as.api.asbusrepairbill.*;
import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem;
import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance;
@ -20,7 +21,9 @@ import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
import com.yxt.anrui.as.api.astrackbill.AsTrackBillDto;
import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
import com.yxt.anrui.as.api.utils.AsRule;
import com.yxt.anrui.as.api.utils.FileUrlQuery;
import com.yxt.anrui.as.api.utils.domain.AsBillNo;
import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService;
import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceService;
@ -32,6 +35,7 @@ import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRep
import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService;
import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService;
import com.yxt.anrui.as.biz.astrackbill.AsTrackBillService;
import com.yxt.anrui.as.feign.file.AsFileEnum;
import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.as.feign.fms.FmsReceivesettle;
@ -71,6 +75,8 @@ import java.util.*;
@Service
public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMapper, AsBusrepairBill> {
@Autowired
private AsAppendixService asAppendixService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
@ -204,6 +210,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
asBusrepairBillSitemService.delByBillSid(sid);
asBusrepairBillSitemRepairerService.delByBillSid(sid);
asBusrepairBillAitemService.delByBillSid(sid);
asAppendixService.delByLinkSid(sid);
} else {
AsBusrepairBill asBusrepairBill = new AsBusrepairBill();
sid = asBusrepairBill.getSid();
@ -349,6 +356,20 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
asBusrepairInventorybillDetailService.updateById(goods);
}
}
//图片
List<FileUrlQuery> fileList = dto.getFileName();
if (!fileList.isEmpty()) {
for (FileUrlQuery query : fileList) {
String filePath = query.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
AsAppendix asAppendix = new AsAppendix();
asAppendix.setLinkSid(sid);
asAppendix.setAttachType(AsFileEnum.WXGD.getAttachType());
asAppendix.setFilePath(filePath);
asAppendixService.save(asAppendix);
}
}
}
return rb.success().setData(sid);
}
@ -505,6 +526,20 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
}
vo.setSettleVo(settleVo);
}
List<FileUrlQuery> file = new ArrayList<>();
List<AsAppendix> asAppendices = asAppendixService.fetchByLinkSid(sid);
if (!asAppendices.isEmpty()) {
for (AsAppendix asAppendix : asAppendices) {
FileUrlQuery fileUrlQuery = new FileUrlQuery();
String url = fileUploadComponent.getUrlPrefix() + asAppendix.getFilePath();
fileUrlQuery.setUrl(url);
String fileName = asAppendix.getFileName();
String fileType = asAppendix.getFileType();
fileUrlQuery.setName(fileName + "." + fileType);
file.add(fileUrlQuery);
}
}
vo.setFileName(file);
}
return rb.success().setData(vo);
}
@ -735,7 +770,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
IPage<AsBusrepairPageVo> pagging = baseMapper.pageBillList(page, qw);
for (AsBusrepairPageVo record : pagging.getRecords()) {
String photoss = record.getPhotoss();
if (StringUtils.isNotBlank(photoss)){
if (StringUtils.isNotBlank(photoss)) {
String[] files = photoss.split(",");
List<String> photos = new ArrayList<>();
for (String file : files) {

1
yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java
View File

@ -11,6 +11,7 @@ public enum AsFileEnum {
ASBWDIFFAPPLY("002", "保外工单应收调差附件"),
ASBWDIFFAPPLYDETAIL("003", "保外工单应收调差工单附件"),
ASWXXMBA("004", "维修项目备案附件"),
WXGD("005", "维修工单附件")
;

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java
View File

@ -107,14 +107,14 @@ public class BaseSupplierTypeService extends MybatisBaseService<BaseSupplierType
if (StringUtils.isBlank(dtoSid)) {
int i = baseMapper.checkSaveCode(dto.getSupplierTypeCode(),dto.getUseOrgSid());
if (i > 0){
return rb.setMsg("新增编码已存在，请重新输入");
return rb.setMsg("类型编码已存在，请重新输入");
}
this.insertByDto(dto);
return rb.success();
}
int i = baseMapper.checkUpdateCode(dto.getSupplierTypeCode(),dto.getUseOrgSid(),dtoSid);
if (i > 0){
return rb.setMsg("修改编码已存在，请重新输入");
return rb.setMsg("类型编码已存在，请重新输入");
}
this.updateByDto(dto);
return rb.success();

Write Preview
Loading…
Cancel
Save