Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
a12e7e6f85
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleModelPriceQuery.java
  2. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  4. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  5. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
  6. 16
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderContractNoDto.java
  7. 9
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  8. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  9. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  10. 13
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  11. 3
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempDto.java
  12. 8
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
  13. 13
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  14. 2
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
  15. 63
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java
  16. 3
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java
  17. 39
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDetailsVo.java
  18. 4
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDto.java
  19. 15
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeign.java
  20. 10
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeignFallback.java
  21. 12
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuVo.java
  22. 3
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java
  23. 21
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml
  24. 11
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuRest.java
  25. 26
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java
  26. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
  27. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleModelPriceQuery.java

@ -19,6 +19,9 @@ public class VehicleModelPriceQuery implements Query {
@ApiModelProperty(value = "名称(优先级最高,有值时 查询车型名称)")
private String name;
@ApiModelProperty("机构sid")
private String orgPath;
@ApiModelProperty(value = "品牌名称")
private String brand;

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -1201,7 +1201,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
public IPage<VehicleModelPriceVo> getModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
String userSid = pagerQuery.getParams().getUserSid();
// 1、根据业务员部门sid查询分公司sid
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
String orgPath = pagerQuery.getParams().getOrgPath();
String orgSid = "";
if (StringUtils.isBlank(orgPath)) {
orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
} else {
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
if (StringUtils.isNotBlank(orgSid)) {
pagerQuery.getParams().setUseOrg(orgSid);
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -1508,6 +1508,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("合同审核");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
} else {
//更新销售订单合同编号字段
AppOrderContractNoDto appOrderContractNoDto = new AppOrderContractNoDto();
appOrderContractNoDto.setContractNo(commonContract.getContractNo());
appOrderContractNoDto.setSaleOrderSid(commonContract.getBusSid());
busSalesOrderFeign.updateContractNoBySid(appOrderContractNoDto);
}
return rb.success().setData(resultBean.getData());
} else {

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@ -182,6 +182,11 @@ public interface BusSalesOrderFeign {
@ResponseBody
ResultBean updateNodesBySid(@RequestBody AppOrderRemarkDto dto);
@ApiOperation("更新销售订单补充说明")
@PutMapping("/updateContractNoBySid")
@ResponseBody
ResultBean updateContractNoBySid(@RequestBody AppOrderContractNoDto dto);
@ApiOperation("判断销售订单是否可提交")
@GetMapping("/isSubmit/{sid}")
@ResponseBody

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@ -159,6 +159,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
return null;
}
@Override
public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
return null;
}
@Override
public ResultBean isSubmit(String sid) {
return null;

16
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderContractNoDto.java

@ -0,0 +1,16 @@
package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppOrderContractNoDto implements Dto {
private static final long serialVersionUID = -1955137877682009798L;
@ApiModelProperty(value = "销售订单sid")
private String saleOrderSid;
@ApiModelProperty(value = "合同编号")
private String contractNo;
}

9
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@ -149,6 +149,15 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
*/
int updateNodesBySid(@Param("remarks") String remarks, @Param("sid") String sid);
/**
* 根据销售订单sid更新合同编号字段
*
* @param contractNo 合同编号
* @param sid 销售订单sid
* @return
*/
int updateContractNoBySid(@Param("contractNo") String contractNo, @Param("sid") String sid);
/**
* 初始化销售订单确认提交
*

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -151,6 +151,12 @@
where sid = #{sid}
</update>
<update id="updateContractNoBySid">
update bus_sales_order
set contractNo = #{contractNo}
where sid = #{sid}
</update>
<select id="getSubmitInfo"
resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderSubmitInfoVo">
select bo.customerName name,

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@ -230,6 +230,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
return busSalesOrderService.updateNodesBySid(dto);
}
@Override
public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
return busSalesOrderService.updateContractNoBySid(dto);
}
@Override
public ResultBean isSubmit(String sid) {
return busSalesOrderService.isSubmit(sid);

13
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -1975,6 +1975,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return rb.success().setMsg("保存成功");
}
public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSaleOrderSid();
BusSalesOrder busSalesOrder = fetchBySid(sid);
if (busSalesOrder == null) {
return rb.setMsg("该销售订单单据不存在");
}
//根据销售订单sid更新合同编号字段字段
int i = baseMapper.updateContractNoBySid(dto.getContractNo(), sid);
return rb.success().setMsg("保存成功");
}
/**
* 验证销售顶大是否可提交
*

3
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempDto.java

@ -34,6 +34,9 @@ public class AppCrmCustomerTempDto implements Dto {
@ApiModelProperty("登录用户sid")
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
@ApiModelProperty("客户类型(自然人/法人)")
@NotBlank(message = "客户类型不能为空")
private String customerType;

8
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@ -38,13 +38,9 @@
cct.remind_day,
cct.isOnRemindkey,
cct.companyName,
(select Max(DATE_FORMAT(cv.createTime, '%Y-%m-%d'))
from crm_visit cv
where cv.customerSid = cct.sid
order by cv.id DESC) as visitTime,
cct.follow_state
cct.follow_state,
(select Max(DATE_FORMAT(cv.createTime, '%Y-%m-%d')) from crm_visit cv where cv.customerSid = cct.sid order by cv.id DESC) as visitTime
FROM crm_customer_temp cct
LEFT JOIN crm_visit cv ON cct.sid = cv.customerSid
<where>
${ew.sqlSegment}
</where>

13
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@ -688,8 +688,15 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
@Transactional(rollbackFor = Exception.class)
protected CrmCustomerTemp insertCrmCustomerTemp(AppCrmCustomerTempDto dto, AppUserOrgInfoVo userOrgInfoVo) {
CrmCustomerTemp customerTemp = new CrmCustomerTemp();
String orgPath = dto.getOrgPath();
String useOrgSid = "";
if (StringUtils.isBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
} else {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
dto.fillEntity(customerTemp);
customerTemp.setCreateOrgSid(useOrgSid);
customerTemp.setSid(UUID.randomUUID().toString());
if (StringUtils.isNotBlank(customerTemp.getCustomerPhoto())) {
customerTemp.setCustomerPhoto(customerTemp.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
@ -697,8 +704,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
// Map<String, String> map = genetrateCustomerNum(dto.getCustomerTypeKey(), userOrgInfoVo);
customerTemp.setCreateBySid(dto.getUserSid());
customerTemp.setStaffSid(userOrgInfoVo.getStaffSid());
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
customerTemp.setCreateOrgSid(orgSid);
// String orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
// customerTemp.setCreateOrgSid(orgSid);
// customerTemp.setCreateOrgSid(userOrgInfoVo.getOrgSid());
// customerTemp.setCustomerNo(map.get("code"));
customerTemp.setCertificateTypeKey(customerTemp.getCustomerTypeKey().equals("1") ? "01" : "02");

2
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@ -20,7 +20,7 @@
</select>
<select id="fetchByCustomerSid" resultType="com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandVo">
SELECT sid
SELECT *
FROM crm_vehicledemand
WHERE customerSid = #{customerSid}
AND states = 1

63
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java

@ -375,7 +375,18 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
public ResultBean saveCrmVisit(AppCrmVisitDto appCrmVisitDto) {
ResultBean rb = ResultBean.fireFail();
String userSid = appCrmVisitDto.getUserSid();
String staffSid = sysUserFeign.fetchBySid(userSid).getData().getStaffSid();
String orgSid = sysUserFeign.getSysUserByMobile(staffSid).getData().getOrgSid();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String customerSid = appCrmVisitDto.getCustomerSid();
String remind_day = appCrmVisitDto.getRemind_day();
String remind_remark = appCrmVisitDto.getRemind_remark();
String isOnRemind = appCrmVisitDto.getIsOnRemind();
String follow_state = appCrmVisitDto.getFollow_state();
String isOnRemindkey = appCrmVisitDto.getIsOnRemindkey();
if (StringUtils.isNotBlank(isOnRemindkey)) { // 0 未开启 1 开启
String remindDay = "未设置提醒";
if (isOnRemindkey.equals("0")) {
@ -394,65 +405,49 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
}
}
}
String customerSid = appCrmVisitDto.getCustomerSid();
String remind_day = appCrmVisitDto.getRemind_day();
String remind_remark = appCrmVisitDto.getRemind_remark();
String isOnRemind = appCrmVisitDto.getIsOnRemind();
String follow_state = appCrmVisitDto.getFollow_state();
List<String> materialsList = appCrmVisitDto.getMaterialsList();
String visit_witness_materials = "";
int i = crmCustomerService.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey, follow_state);
if (i > 0) {
CrmVisit entity = new CrmVisit();
List<String> materialsList = appCrmVisitDto.getMaterialsList();
appCrmVisitDto.fillEntity(entity);
entity.setCustomerSid(appCrmVisitDto.getCustomerSid());
entity.setStaffSid(staffSid);
entity.setOrgSid(orgSid);
entity.setPositionInformation(appCrmVisitDto.getLocationStr());
entity.setFollow_time(format.format(new Date()));
if (materialsList.size() > 0) {
String visit_witness_materials = "";
for (int j = 0; j < materialsList.size(); j++) {
String url = materialsList.get(j);
visit_witness_materials += url.replace(fileUploadComponent.getUrlPrefix(), "") + ",";
}
appCrmVisitDto.setVisit_witness_materials(visit_witness_materials.substring(0, visit_witness_materials.length() - 1));
} else {
appCrmVisitDto.setVisit_witness_materials("");
}
appCrmVisitDto.fillEntity(entity);
String userSid = appCrmVisitDto.getUserSid();
String staffSid = sysUserFeign.fetchBySid(userSid).getData().getStaffSid();
String orgSid = sysUserFeign.getSysUserByMobile(staffSid).getData().getOrgSid();
entity.setSid(UUID.randomUUID().toString());
entity.setCustomerSid(appCrmVisitDto.getCustomerSid());
entity.setStaffSid(staffSid);
entity.setOrgSid(orgSid);
String location = appCrmVisitDto.getLocation();
if (location == null) {
entity.setLongitude("");
entity.setLatitude("");
}
String[] split = location.split(",");
// 取出详细地址经纬度
if (StringUtils.isNotBlank(appCrmVisitDto.getLocation())) {
String[] split = appCrmVisitDto.getLocation().split(",");
for (int i1 = 0; i1 < split.length; i1++) {
entity.setLongitude(split[0]);
entity.setLatitude(split[1]);
}
entity.setPositionInformation(appCrmVisitDto.getLocationStr());
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
String follow_time = formatter.format(new Date());
entity.setFollow_time(follow_time);
List<String> list = appCrmVisitDto.getMaterialsList();
if (list.size() > 0) {
for (String s : list) {
}
//保存跟进材料附件
if (materialsList.size() > 0) {
AppCommonAppendixDto appCommonAppendixDto = new AppCommonAppendixDto();
appCommonAppendixDto.setFilePath(appCrmVisitDto.getMaterialsList());
appCommonAppendixDto.setFilePath(materialsList);
appCommonAppendixDto.setAttachType(CommonAttachTypeEnum.WITNESS.getAttachType());
appCommonAppendixDto.setLinkSid(entity.getSid());
commonAppendixFeign.saveOrUpdateAppAppendix(appCommonAppendixDto);
}
}
String visitSid = entity.getSid();
//客户需求车辆和跟进记录关联
List<CrmVehicledemandVo> crmVehicledemandVos = crmVehicledemandService.fetchByCustomerSid(customerSid);
if (crmVehicledemandVos.size() > 0) {
for (CrmVehicledemandVo crmVehicledemandVo : crmVehicledemandVos) {
String demandSid = crmVehicledemandVo.getSid();
crmVisitDemandService.saveByVisit(visitSid, demandSid);
crmVisitDemandService.saveByVisit(entity.getSid(), demandSid);
}
}
int insert = baseMapper.insert(entity);
if (insert > 0) {
return rb.success().setMsg("添加成功");

3
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java

@ -21,6 +21,9 @@ public class SysMobileMenu extends BaseEntity {
@ApiModelProperty("插件sid")
private String linkSid;
@ApiModelProperty("插件的appName")
private String linkName;
@ApiModelProperty("应用图标")
private String iconUrl;

39
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDetailsVo.java

@ -0,0 +1,39 @@
package com.yxt.anrui.portal.api.sysmobilemenu;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/10/28 10:18
* @Description
*/
@Data
public class SysMobileMenuDetailsVo implements Vo {
private static final long serialVersionUID = -2338377632853435516L;
@ApiModelProperty("应用分类")
private String titleGroup;
@ApiModelProperty("应用名称")
private String title;
@ApiModelProperty("应用图标")
private String iconUrl;
@ApiModelProperty("应用路由")
private String path;
@ApiModelProperty("json")
private String json;
@ApiModelProperty("排序号")
private String sortNo;
@ApiModelProperty("插件sid")
private String linkSid;
@ApiModelProperty("插件的appName")
private String linkName;
}

4
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuDto.java

@ -14,6 +14,8 @@ public class SysMobileMenuDto implements Dto {
private static final long serialVersionUID = 2939430292974122530L;
@ApiModelProperty("插件appSid")
private String linkSid;
@ApiModelProperty("插件的appName")
private String linkName;
private String sid;
@ApiModelProperty("应用分类")
@ -33,4 +35,6 @@ public class SysMobileMenuDto implements Dto {
@ApiModelProperty(value = "父级sid", example = "0")
private String psid;
}

15
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeign.java

@ -4,10 +4,7 @@ import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
/**
* @Author dimengzhe
@ -31,4 +28,14 @@ public interface SysMobileMenuFeign {
@GetMapping("/list")
@ResponseBody
ResultBean<SysMobileMenuAllVo> list();
@ApiOperation("应用详情、初始化")
@GetMapping("/details")
@ResponseBody
ResultBean<SysMobileMenuDetailsVo> details(@RequestParam("sid") String sid);
@ApiOperation("删除应用")
@DeleteMapping("/deleteMenu")
@ResponseBody
ResultBean deleteMenu(@RequestParam("sid") String sid);
}

10
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuFeignFallback.java

@ -21,4 +21,14 @@ public class SysMobileMenuFeignFallback implements SysMobileMenuFeign{
public ResultBean<SysMobileMenuAllVo> list() {
return null;
}
@Override
public ResultBean<SysMobileMenuDetailsVo> details(String sid) {
return null;
}
@Override
public ResultBean deleteMenu(String sid) {
return null;
}
}

12
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenuVo.java

@ -29,8 +29,18 @@ public class SysMobileMenuVo implements Vo {
@ApiModelProperty("应用路由:sorceAction")
private String sourceAction;
private String sid;
// private String sid;
private String appSid;
private List<SysMobileMenuListVo> mobileMenuList;
@ApiModelProperty("主框架的appSId")
private String linkSid;
@ApiModelProperty("插件名称")
private String modulePluginName;
@ApiModelProperty("包名")
private String sourcePackage;
@ApiModelProperty("type")
private String type;
}

3
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.java

@ -2,6 +2,7 @@ package com.yxt.anrui.portal.biz.sysmobilemenu;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDetailsVo;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -19,4 +20,6 @@ public interface SysMobileMenuMapper extends BaseMapper<SysMobileMenu> {
List<SysMobileMenuVo> listAll(@Param("path") String path, @Param("linkSid") String linkSid);
List<SysMobileMenu> getMenu(String appSid);
SysMobileMenuDetailsVo details(@Param("sid") String sid, @Param("path") String path);
}

21
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuMapper.xml

@ -9,9 +9,12 @@
if(length(asv.iconUrl) > 0, concat(#{path}, asv.iconUrl), '') as iconUrl,
asv.versionName,
asv.`id`,
asv.sid,
DATE_FORMAT(asv.modifyTime, '%Y-%m-%d') as modifyTime,
asv.sourceAction
asv.sourceAction,
asv.linkSid,
asv.modulePluginName,
asv.sourcePackage,
asv.type
FROM app_subset_version asv
WHERE linkSid = #{linkSid}
AND id IN (SELECT MAX(id) FROM app_subset_version GROUP BY appSid)
@ -20,7 +23,6 @@
<resultMap id="listMap" type="com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuVo">
<result column="appName" jdbcType="VARCHAR" property="appName"/>
<result column="sid" jdbcType="VARCHAR" property="sid"/>
<result column="iconUrl" jdbcType="VARCHAR" property="iconUrl"/>
<result column="versionName" jdbcType="INTEGER" property="versionName"/>
<result column="modifyTime" jdbcType="VARCHAR" property="modifyTime"/>
@ -74,4 +76,17 @@
from sys_mobile_menu
where linkSid = #{appSid}
</select>
<select id="details" resultType="com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDetailsVo">
select titleGroup,
title,
if(length(iconUrl) > 0, concat(#{path}, iconUrl), '') as iconUrl,
path,
json,
sortNo,
linkSid,
linkName
from sys_mobile_menu
where sid = #{sid}
</select>
</mapper>

11
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuRest.java

@ -1,6 +1,7 @@
package com.yxt.anrui.portal.biz.sysmobilemenu;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuAllVo;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDetailsVo;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDto;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuFeign;
import com.yxt.common.core.result.ResultBean;
@ -31,4 +32,14 @@ public class SysMobileMenuRest implements SysMobileMenuFeign {
public ResultBean<SysMobileMenuAllVo> list() {
return sysMobileMenuService.listAll();
}
@Override
public ResultBean<SysMobileMenuDetailsVo> details(String sid) {
return sysMobileMenuService.details(sid);
}
@Override
public ResultBean deleteMenu(String sid) {
return sysMobileMenuService.deleteMenu(sid);
}
}

26
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java

@ -2,10 +2,7 @@ package com.yxt.anrui.portal.biz.sysmobilemenu;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.portal.api.appversion.AppVersionVo;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuAllVo;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuDto;
import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenuVo;
import com.yxt.anrui.portal.api.sysmobilemenu.*;
import com.yxt.anrui.portal.biz.appversion.AppVersionService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
@ -68,4 +65,25 @@ public class SysMobileMenuService extends MybatisBaseService<SysMobileMenuMapper
public List<SysMobileMenu> getMenu(String appSid) {
return baseMapper.getMenu(appSid);
}
public ResultBean<SysMobileMenuDetailsVo> details(String sid) {
ResultBean<SysMobileMenuDetailsVo> rb = ResultBean.fireFail();
SysMobileMenu sysMobileMenu = fetchBySid(sid);
if (sysMobileMenu == null) {
return rb.setMsg("该应用不存在");
}
String path = fileUploadComponent.getUrlPrefix();
SysMobileMenuDetailsVo sysMobileMenuDetailsVo = baseMapper.details(sid, path);
return rb.success().setData(sysMobileMenuDetailsVo);
}
public ResultBean deleteMenu(String sid) {
ResultBean rb = ResultBean.fireFail();
SysMobileMenu sysMobileMenu = fetchBySid(sid);
if (sysMobileMenu == null) {
return rb.setMsg("该应用不存在");
}
deleteBySid(sid);
return rb.success();
}
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@ -452,7 +452,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
patrolinspectionsheetDto.setProblems(dto.getRemarks());
patrolinspectionsheetDto.setWarehouse(dto.getLocation());
patrolinspectionsheetDto.setWarehouseSid(dto.getLocationSid());
patrolinspectionsheetDto.setUserSid(createOrgSid);
patrolinspectionsheetDto.setUserSid(userSid);
patrolinspectionsheetDto.setUserName(dto.getLoginName());
patrolinspectionsheetDto.setLocation(dto.getAddressCode());
patrolinspectionsheetDto.setAddress(dto.getAddress());

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@ -402,8 +402,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
if (StringUtils.isBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
} else {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getUserSid()).getData();
;
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
VehRecordsQuery vehRecordsQuery = new VehRecordsQuery();
vehRecordsQuery.setOrgPath(orgPath);

Loading…
Cancel
Save