Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
d50086832b
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  3. 41
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  4. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  5. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
  6. 14
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  7. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java
  8. 456
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java
  9. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml
  10. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

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

@ -51,6 +51,10 @@ public interface BaseVehicleOutFeign {
@ResponseBody @ResponseBody
ResultBean<PdfPath> createPdf(@RequestParam("xsckdSid") String xsckdSid, @RequestParam("printerType") String printerType); ResultBean<PdfPath> createPdf(@RequestParam("xsckdSid") String xsckdSid, @RequestParam("printerType") String printerType);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySid")
@ResponseBody
public ResultBean delBySid(@RequestParam("sid") String sid);
} }

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@ -491,4 +491,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
BasePurchSystemVo getSystem(@Param("useOrgSid") String useOrgSid, @Param("purchaseSystemSid") String purchaseSystemSid); BasePurchSystemVo getSystem(@Param("useOrgSid") String useOrgSid, @Param("purchaseSystemSid") String purchaseSystemSid);
void updateVehicleStateAndSaleDate(String sid);
} }

41
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -592,19 +592,19 @@
</select> </select>
<select id="getVins" resultType="com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo"> <select id="getVins" resultType="com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo">
SELECT bv.vinNo AS vin, SELECT bv.vinNo AS vin,
bv.locationName AS address, bv.locationName AS address,
bv.sid AS carSid bv.sid AS carSid
FROM base_vehicle bv FROM base_vehicle bv
WHERE bv.modelSid = #{modelSid} WHERE bv.modelSid = #{modelSid}
AND bv.modelConfigSid = #{configSid} AND bv.modelConfigSid = #{configSid}
AND bv.lockedState = #{state} AND bv.lockedState = #{state}
and bv.useOrgSid = #{orgSid} and bv.useOrgSid = #{orgSid}
AND ( AND (
bv.vehicleStateValue = '库存' bv.vehicleStateValue = '库存'
or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入' or bv.vehicleStateValue = '调入'
) )
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and bv.vinNo LIKE concat('%', #{name}, '%') and bv.vinNo LIKE concat('%', #{name}, '%')
</if> </if>
@ -1048,7 +1048,7 @@
or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入' or bv.vehicleStateValue = '调入'
) )
order by isFictitious,bv.locationName,bv.vinNo desc order by isFictitious, bv.locationName, bv.vinNo desc
</select> </select>
<select id="selectAppListOne" resultType="com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo"> <select id="selectAppListOne" resultType="com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo">
@ -1563,11 +1563,22 @@
<select id="selectByfMaterialID" resultType="java.lang.String"> <select id="selectByfMaterialID" resultType="java.lang.String">
SELECT orderingNo SELECT orderingNo
FROM base_vehicle FROM base_vehicle
WHERE vinNo like concat('%', #{fMaterialID}, '%') WHERE vinNo like concat('%', #{fMaterialID}, '%') LIMIT 1
LIMIT 1
</select> </select>
<select id="getSystem" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo"> <select id="getSystem" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo">
select purchaseSystemName,sid from base_purchase_system where useOrgSid = #{useOrgSid} and deptSid = #{purchaseSystemSid} select purchaseSystemName, sid
from base_purchase_system
where useOrgSid = #{useOrgSid}
and deptSid = #{purchaseSystemSid}
</select> </select>
<update id="updateVehicleStateAndSaleDate">
UPDATE
base_vehicle
SET vehicleState = "0001",
vehicleStateValue = "库存",
salesDate = null
WHERE sid = #{sid}
</update>
</mapper> </mapper>

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

@ -3645,4 +3645,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
basePurchSystemVo.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); basePurchSystemVo.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
return rb.success().setData(basePurchSystemVo); return rb.success().setData(basePurchSystemVo);
} }
public void updateVehicleStateAndSaleDate(String sid) {
baseMapper.updateVehicleStateAndSaleDate(sid);
}
} }

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

@ -58,4 +58,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
PdfPath pdf = baseVehicleOutService.createPdf(xsckdSid,printerType); PdfPath pdf = baseVehicleOutService.createPdf(xsckdSid,printerType);
return rb.success().setData(pdf); return rb.success().setData(pdf);
} }
@Override
public ResultBean delBySid(String sid) {
return baseVehicleOutService.delBySid(sid);
}
} }

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

@ -291,6 +291,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid()); baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setCreateBySid(dto.getCreateBySid()); baseVehicleOut.setCreateBySid(dto.getCreateBySid());
baseVehicleOut.setCreateByName(dto.getCreateByName()); baseVehicleOut.setCreateByName(dto.getCreateByName());
baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
//保存车辆出库单子表 //保存车辆出库单子表
baseMapper.insert(baseVehicleOut); baseMapper.insert(baseVehicleOut);
dto.setBillNo(billNo); dto.setBillNo(billNo);
@ -580,6 +581,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid()); baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setCreateBySid(dto.getCreateBySid()); baseVehicleOut.setCreateBySid(dto.getCreateBySid());
baseVehicleOut.setCreateByName(dto.getCreateByName()); baseVehicleOut.setCreateByName(dto.getCreateByName());
baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
//保存车辆出库单子表 //保存车辆出库单子表
baseMapper.insert(baseVehicleOut); baseMapper.insert(baseVehicleOut);
dto.setBillNo(billNo); dto.setBillNo(billNo);
@ -1103,4 +1105,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
public BaseVehicleOutDetailsVo selByOrgSidAndVehSid(String useOrgSid, String vehSid) { public BaseVehicleOutDetailsVo selByOrgSidAndVehSid(String useOrgSid, String vehSid) {
return baseMapper.selByOrgSidAndVehSid(useOrgSid, vehSid); return baseMapper.selByOrgSidAndVehSid(useOrgSid, vehSid);
} }
public ResultBean delBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseVehicleOut baseVehicleOut = fetchBySid(sid);
//删除出库车辆信息
deleteBySid(sid);
//删除出库申请单
baseVehicleOutApplyService.deleteBySid(baseVehicleOut.getMainSid());
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehicleOut.getVinNo(), baseVehicleOut.getCreateOrgSid());
baseVehicleService.updateVehicleStateAndSaleDate(baseVehicle.getSid());
return rb.success();
}
} }

6
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java

@ -62,8 +62,10 @@ public interface SysFunctionMapper extends BaseMapper<SysFunction> {
List<Map<String, Object>> getSourceAuthorization(@Param("roleSid")String roleSid); List<Map<String, Object>> getSourceAuthorization(@Param("roleSid")String roleSid);
@Select("SELECT sm.name,sm.sid,sm.pageUrl FROM sys_menu sm LEFT JOIN sys_source_menu ssm ON sm.sid=ssm.menuSid where ssm.sourceSid=#{sourceSid}") @Select("SELECT sm.name,sm.sid,sm.pageUrl FROM sys_menu sm LEFT JOIN sys_source_menu ssm ON sm.sid=ssm.menuSid where ssm.sourceSid=#{sourceSid}")
List<Map<String, Object>> getMenuAuthorization(@Param("sourceSid") String sourceSid); List<Map<String, Object>> getMenuAuthorization(@Param("sourceSid") String sourceSid);
@Select("SELECT sf.name,sf.sid FROM sys_function sf WHERE sf.actionUrl= #{pageUrl}")
List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl);
@Select("SELECT sf.name,sf.sid,IF(IFNULL(srf.id,0)<=0,1,0) checked FROM sys_function sf " + @Select("SELECT sf.name,sf.sid,IF(IFNULL(srf.id,0)<=0,1,0) checked FROM sys_function sf " +
" LEFT JOIN sys_role_function srf ON srf.functionSid=sf.sid " + " LEFT JOIN sys_role_function srf ON srf.functionSid=sf.sid " +
" WHERE sf.actionUrl= #{pageUrl} ") " WHERE sf.actionUrl= #{pageUrl} AND srf.roleSid = #{roleSid} ")
List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl); List<Map<String, Object>> getFunctionByRoleSid(@Param("pageUrl") String pageUrl,@Param("roleSid") String roleSid);
} }

456
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java

@ -35,247 +35,263 @@ import java.util.Map;
*/ */
@Service @Service
public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, SysFunction> { public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, SysFunction> {
@Autowired @Autowired
private SysSourceService sysSourceService; private SysSourceService sysSourceService;
@Autowired @Autowired
private SysSourceFunctionService sysSourceFunctionService; private SysSourceFunctionService sysSourceFunctionService;
public PagerVo<SysFunction> listPage(PagerQuery<SysFunctionQuery> pq) {
SysFunctionQuery query = pq.getParams();
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
IPage<SysFunction> page = PagerUtil.queryToPage(pq);
IPage<SysFunction> pagging = baseMapper.selectPage(page, qw);
PagerVo<SysFunction> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysFunction> listAll(SysFunctionQuery query) {
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<SysFunction> createQueryWrapper(SysFunctionQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
public PagerVo<SysFunction> listPage(PagerQuery<SysFunctionQuery> pq) {
SysFunctionQuery query = pq.getParams();
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
IPage<SysFunction> page = PagerUtil.queryToPage(pq);
IPage<SysFunction> pagging = baseMapper.selectPage(page, qw);
PagerVo<SysFunction> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysFunction> listAll(SysFunctionQuery query) {
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<SysFunction> createQueryWrapper(SysFunctionQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.eq("name", query.getName());
}
if (query.getLevel() != null) {
qw.eq("level", query.getLevel());
}
if (StringUtils.isNotBlank(query.getParentSid())) {
qw.eq("parentSid", query.getParentSid());
}
if (StringUtils.isNotBlank(query.getActionUrl())) {
qw.eq("actionUrl", query.getActionUrl());
}
if (StringUtils.isNotBlank(query.getControllerName())) {
qw.eq("controllerName", query.getControllerName());
}
if (StringUtils.isNotBlank(query.getFunId())) {
qw.eq("funId", query.getFunId());
}
if (query.getPhoneFunction() != null) {
qw.eq("phoneFunction", query.getPhoneFunction());
}
return qw;
}
public PagerVo<SysFunctionVo> listPageVo(PagerQuery<SysFunctionQuery> pq) {
SysFunctionQuery query = pq.getParams();
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
IPage<SysFunction> page = PagerUtil.queryToPage(pq);
IPage<SysFunctionVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SysFunctionVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
if (StringUtils.isNotBlank(query.getName())) { public List<SysFunctionVo> listAllVo(SysFunctionQuery query) {
qw.eq("name", query.getName()); QueryWrapper<SysFunction> qw = new QueryWrapper<>();
} qw.eq("func.parentSid", "0");
List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
for (SysFunctionVo s : sysFunctionVos) {
getChildrens(s);
}
return sysFunctionVos;
}
if (query.getLevel() != null) { private void getChildrens(SysFunctionVo s) {
qw.eq("level", query.getLevel()); String sid = s.getSid();
} QueryWrapper<SysFunction> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(sid)) {
qw.eq("func.parentSid", sid);
}
List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
if (!sysFunctionVos.isEmpty()) {
for (SysFunctionVo sfv : sysFunctionVos) {
getChildrens(sfv);
}
}
s.setChildren(sysFunctionVos);
}
if (StringUtils.isNotBlank(query.getParentSid())) { public List<SysFunctionVo> listVo() {
qw.eq("parentSid", query.getParentSid()); return baseMapper.selectListVo();
} }
if (StringUtils.isNotBlank(query.getActionUrl())) { public void saveOrUpdateDto(SysFunctionDto dto) {
qw.eq("actionUrl", query.getActionUrl()); SysFunction entity = new SysFunction();
} dto.fillEntity(entity);
SysSourceFunction sysSourceFunction = new SysSourceFunction();
sysSourceFunction.setFunctionSid(entity.getSid());
sysSourceFunction.setSourceSid(dto.getSourceSid());
setRootSid(entity, sysSourceFunction);
sysSourceFunctionService.save(sysSourceFunction);
this.saveOrUpdate(entity);
}
if (StringUtils.isNotBlank(query.getControllerName())) { private void setRootSid(SysFunction entity, SysSourceFunction sysSourceFunction) {
qw.eq("controllerName", query.getControllerName()); String pSid = entity.getParentSid();
} if ("0".equals(pSid)) {
sysSourceFunction.setFunctionRootSid(entity.getSid());
} else {
SysFunction sysFunction = this.fetchBySid(pSid);
String pSid1 = sysFunction.getParentSid();
if ("0".equals(pSid1)) {
sysSourceFunction.setFunctionRootSid(sysFunction.getSid());
}
setRootSid(sysFunction, sysSourceFunction);
}
}
if (StringUtils.isNotBlank(query.getFunId())) { public SysFunctionVo fetchByIdVo(String id) {
qw.eq("funId", query.getFunId()); SysFunction entity = this.fetchById(id);
} SysFunctionVo vo = new SysFunctionVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
if (query.getPhoneFunction() != null) { public List<SysFunctionVo> listAllByRoleSid(SysFunctionQuery query) {
qw.eq("phoneFunction", query.getPhoneFunction()); List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(), "0");
} for (SysFunctionVo s : sysFunctionVos) {
return qw; getChildrensByRoleSid(s, query.getRoleSid());
} }
return sysFunctionVos;
public PagerVo<SysFunctionVo> listPageVo(PagerQuery<SysFunctionQuery> pq) { }
SysFunctionQuery query = pq.getParams();
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
IPage<SysFunction> page = PagerUtil.queryToPage(pq);
IPage<SysFunctionVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SysFunctionVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysFunctionVo> listAllVo(SysFunctionQuery query) {
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
qw.eq("func.parentSid", "0");
List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
for(SysFunctionVo s:sysFunctionVos){
getChildrens(s);
}
return sysFunctionVos;
}
private void getChildrens(SysFunctionVo s){
String sid = s.getSid();
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(sid)) {
qw.eq("func.parentSid", sid);
}
List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
if(!sysFunctionVos.isEmpty()){
for(SysFunctionVo sfv:sysFunctionVos){
getChildrens(sfv);
}
}
s.setChildren(sysFunctionVos);
}
public List<SysFunctionVo> listVo() {
return baseMapper.selectListVo();
}
public void saveOrUpdateDto(SysFunctionDto dto){
SysFunction entity = new SysFunction();
dto.fillEntity(entity);
SysSourceFunction sysSourceFunction = new SysSourceFunction();
sysSourceFunction.setFunctionSid(entity.getSid());
sysSourceFunction.setSourceSid(dto.getSourceSid());
setRootSid(entity,sysSourceFunction);
sysSourceFunctionService.save(sysSourceFunction);
this.saveOrUpdate(entity);
}
private void setRootSid(SysFunction entity,SysSourceFunction sysSourceFunction){
String pSid = entity.getParentSid();
if("0".equals(pSid)){
sysSourceFunction.setFunctionRootSid(entity.getSid());
}else{
SysFunction sysFunction = this.fetchBySid(pSid);
String pSid1 = sysFunction.getParentSid();
if("0".equals(pSid1)){
sysSourceFunction.setFunctionRootSid(sysFunction.getSid());
}
setRootSid(sysFunction,sysSourceFunction);
}
}
public SysFunctionVo fetchByIdVo(String id){
SysFunction entity = this.fetchById(id);
SysFunctionVo vo = new SysFunctionVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<SysFunctionVo> listAllByRoleSid(SysFunctionQuery query) { private void getChildrensByRoleSid(SysFunctionVo s, String roleSid) {
List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(),"0"); List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(roleSid, s.getSid());
for(SysFunctionVo s:sysFunctionVos){ if (!sysFunctionVos.isEmpty()) {
getChildrensByRoleSid(s,query.getRoleSid()); for (SysFunctionVo sfv : sysFunctionVos) {
} getChildrensByRoleSid(sfv, roleSid);
return sysFunctionVos; }
} }
private void getChildrensByRoleSid(SysFunctionVo s,String roleSid){ s.setChildren(sysFunctionVos);
List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(roleSid,s.getSid()); }
if(!sysFunctionVos.isEmpty()){
for(SysFunctionVo sfv:sysFunctionVos){
getChildrensByRoleSid(sfv,roleSid);
}
}
s.setChildren(sysFunctionVos);
}
public List<SysFunctionTreeVo> listAllVoForSource(SysFunctionQuery query) { public List<SysFunctionTreeVo> listAllVoForSource(SysFunctionQuery query) {
String name = query.getName(); String name = query.getName();
List<SysFunctionTreeVo> sysSourceVos = sysSourceService.listFunctionTreeVo(name); List<SysFunctionTreeVo> sysSourceVos = sysSourceService.listFunctionTreeVo(name);
for (SysFunctionTreeVo s : sysSourceVos) { for (SysFunctionTreeVo s : sysSourceVos) {
List<SysFunctionTreeVo> sysFunctionVoList = sysSourceFunctionService.fetchRootFunctionBySourceSid(s.getSourceSid()); List<SysFunctionTreeVo> sysFunctionVoList = sysSourceFunctionService.fetchRootFunctionBySourceSid(s.getSourceSid());
s.setChildren(sysFunctionVoList); s.setChildren(sysFunctionVoList);
s.setIsSource("1"); s.setIsSource("1");
//判断该资源下的功能是否有可用的状态 //判断该资源下的功能是否有可用的状态
int isEnable = 1; int isEnable = 1;
int count = baseMapper.selectBySourceSid(isEnable, s.getSourceSid()); int count = baseMapper.selectBySourceSid(isEnable, s.getSourceSid());
if (count == 0) { if (count == 0) {
s.setIsEnable("0"); s.setIsEnable("0");
} else { } else {
s.setIsEnable("1"); s.setIsEnable("1");
} }
if (!sysFunctionVoList.isEmpty()) { if (!sysFunctionVoList.isEmpty()) {
// sysFunctionVoList = getChildrensForFunctionTree(sysFunctionVoList); // sysFunctionVoList = getChildrensForFunctionTree(sysFunctionVoList);
getChildList(sysFunctionVoList); getChildList(sysFunctionVoList);
} }
} }
return sysSourceVos; return sysSourceVos;
} }
public void getChildList(List<SysFunctionTreeVo> list) { public void getChildList(List<SysFunctionTreeVo> list) {
list.forEach(str -> { list.forEach(str -> {
String sid = str.getSid(); String sid = str.getSid();
List<SysFunctionTreeVo> listChildren = baseMapper.selectChildernList(sid); List<SysFunctionTreeVo> listChildren = baseMapper.selectChildernList(sid);
str.setChildren(listChildren); str.setChildren(listChildren);
getChildList(listChildren); getChildList(listChildren);
}); });
} }
private List<SysFunctionTreeVo> getChildrensForFunctionTree(List<SysFunctionTreeVo> sysFunctionVoList) { private List<SysFunctionTreeVo> getChildrensForFunctionTree(List<SysFunctionTreeVo> sysFunctionVoList) {
List<SysFunctionTreeVo> list = new ArrayList<>(); List<SysFunctionTreeVo> list = new ArrayList<>();
for (SysFunctionTreeVo s : sysFunctionVoList) { for (SysFunctionTreeVo s : sysFunctionVoList) {
SysFunction sysFunction = fetchBySid(s.getFunctionRootSid()); SysFunction sysFunction = fetchBySid(s.getFunctionRootSid());
SysFunctionTreeVo sysFunctionTreeVo = new SysFunctionTreeVo(); SysFunctionTreeVo sysFunctionTreeVo = new SysFunctionTreeVo();
BeanUtil.copyProperties(sysFunction, sysFunctionTreeVo); BeanUtil.copyProperties(sysFunction, sysFunctionTreeVo);
/*sysFunctionTreeVo.setParentName("顶级功能");*/ /*sysFunctionTreeVo.setParentName("顶级功能");*/
list.add(sysFunctionTreeVo); list.add(sysFunctionTreeVo);
} }
for (SysFunctionTreeVo s : list) { for (SysFunctionTreeVo s : list) {
getChildrensForFunctionTree(s, s.getSid()); getChildrensForFunctionTree(s, s.getSid());
} }
return list; return list;
} }
private void getChildrensForFunctionTree(SysFunctionTreeVo s, String sid) { private void getChildrensForFunctionTree(SysFunctionTreeVo s, String sid) {
QueryWrapper<SysFunctionTreeVo> qw = new QueryWrapper<>(); QueryWrapper<SysFunctionTreeVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(sid)) { if (StringUtils.isNotBlank(sid)) {
qw.eq("func.parentSid", sid); qw.eq("func.parentSid", sid);
} }
List<SysFunctionTreeVo> sysMenuVos = baseMapper.getChildrensForFunctionTree(qw); List<SysFunctionTreeVo> sysMenuVos = baseMapper.getChildrensForFunctionTree(qw);
if (!sysMenuVos.isEmpty()) { if (!sysMenuVos.isEmpty()) {
for (SysFunctionTreeVo smv : sysMenuVos) { for (SysFunctionTreeVo smv : sysMenuVos) {
/*SysFunction sysFunction = fetchBySid(sid); /*SysFunction sysFunction = fetchBySid(sid);
smv.setParentName(sysFunction.getName());*/ smv.setParentName(sysFunction.getName());*/
getChildrensForFunctionTree(smv, smv.getSid()); getChildrensForFunctionTree(smv, smv.getSid());
} }
} }
s.setChildren(sysMenuVos); s.setChildren(sysMenuVos);
} }
public int updateBySourceSid(Integer isEnable, List<String> sids) { public int updateBySourceSid(Integer isEnable, List<String> sids) {
return baseMapper.updateBySourceSid(isEnable, sids); return baseMapper.updateBySourceSid(isEnable, sids);
} }
public List<ButtonPermissionVo> getButtonPermissions(ButtonPermissionQuery query) { public List<ButtonPermissionVo> getButtonPermissions(ButtonPermissionQuery query) {
List<ButtonPermissionVo> buttonPermissions = baseMapper.getButtonPermissions(query); List<ButtonPermissionVo> buttonPermissions = baseMapper.getButtonPermissions(query);
return buttonPermissions ; return buttonPermissions;
} }
public List<Map<String, Object>> getFunctionAuthorization(String roleSid) { public List<Map<String, Object>> getFunctionAuthorization(String roleSid) {
List<Map<String,Object>> list=new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
List<Map<String, Object>> lsources=baseMapper.getSourceAuthorization(roleSid); List<Map<String, Object>> lsources = baseMapper.getSourceAuthorization(roleSid);
lsources.forEach(f->{ lsources.forEach(f -> {
Map<String,Object> map=new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("name",f.get("sourceName").toString()); map.put("name", f.get("sourceName").toString());
map.put("sid",f.get("sid").toString()); map.put("sid", f.get("sid").toString());
map.put("checked","1"); map.put("checked", "1");
list.add(map); list.add(map);
}); });
list.forEach(f->{ list.forEach(f -> {
List<Map<String,Object>> list2=new ArrayList<>(); List<Map<String, Object>> list2 = new ArrayList<>();
String sid = f.get("sid").toString(); String sid = f.get("sid").toString();
List<Map<String, Object>> lmenus=baseMapper.getMenuAuthorization(sid); List<Map<String, Object>> lmenus = baseMapper.getMenuAuthorization(sid);
lmenus.forEach(ff->{ lmenus.forEach(ff -> {
Map<String,Object> map=new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("name",ff.get("name")); map.put("name", ff.get("name"));
String sids = ff.get("sid").toString(); String sids = ff.get("sid").toString();
map.put("sid",sids); map.put("sid", sids);
map.put("checked","1"); map.put("checked", "1");
map.put("children",new ArrayList<>()); map.put("children", new ArrayList<>());
if( ff.get("pageUrl")!=null&& com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())){ if (ff.get("pageUrl") != null && com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())) {
String pageUrl =ff.get("pageUrl").toString(); String pageUrl = ff.get("pageUrl").toString();
List<Map<String, Object>> lfuncs=baseMapper.getFunctionAuthorization(pageUrl); List<Map<String, Object>> lfuncs = baseMapper.getFunctionAuthorization(pageUrl);
lfuncs.forEach(fun->{ List<Map<String, Object>> functionByRoleSid = baseMapper.getFunctionByRoleSid(pageUrl, roleSid);
fun.put("children",new ArrayList<>()); if (lfuncs.size() > 0){
}); for (Map<String, Object> lfunc : lfuncs) {
map.put("children",lfuncs); for (Map<String, Object> funByRole : functionByRoleSid) {
} if (lfunc.get("sid").equals(funByRole.get("sid"))) {
list2.add(map); lfunc.put("checked", "0");
}); }
f.put("children",list2); }
}); lfunc.put("children", new ArrayList<>());
return list; }
}
map.put("children", lfuncs);
}
list2.add(map);
});
f.put("children", list2);
});
return list;
} }
} }

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml

@ -9,6 +9,7 @@
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
ORDER BY saiq.createTime DESC
</select> </select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo"> <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo">

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

@ -126,7 +126,6 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
if (StringUtils.isNotBlank(query.getMakeListName())) { if (StringUtils.isNotBlank(query.getMakeListName())) {
qw.like("saiq.makeListName", query.getMakeListName()); qw.like("saiq.makeListName", query.getMakeListName());
} }
qw.orderByDesc("saiq.createTime");
IPage<ScmApplyInboundQuery> page = PagerUtil.queryToPage(pq); IPage<ScmApplyInboundQuery> page = PagerUtil.queryToPage(pq);
IPage<ScmApplyInboundQueryVo> pagging = baseMapper.selectPageVo(page, qw); IPage<ScmApplyInboundQueryVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmApplyInboundQueryVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<ScmApplyInboundQueryVo> p = PagerUtil.pageToVo(pagging, null);

Loading…
Cancel
Save