Browse Source

系统管理、基础信息、车型配置管理问题修复

master
God 3 years ago
parent
commit
961290b59c
  1. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyDetailsVo.java
  2. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeign.java
  3. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompanyappendix/BaseAffiliatCompanyAppendixDto.java
  4. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListVo.java
  5. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfig.java
  6. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java
  7. 21
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java
  8. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  9. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeign.java
  10. 23
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/QrCodeVo.java
  11. 6
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
  12. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
  13. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeign.java
  14. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeignFallback.java
  15. 4
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
  16. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
  17. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
  18. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
  19. 13
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  20. 36
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  21. 8
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
  22. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java
  23. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleRest.java
  24. 10
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java
  25. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java
  26. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
  27. 20
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
  28. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyDetailsVo.java

@ -24,8 +24,14 @@ public class BaseAffiliatCompanyDetailsVo implements Vo {
@ApiModelProperty(value = "登记注册号类型Value值", required = true) @ApiModelProperty(value = "登记注册号类型Value值", required = true)
private String registNumTypeValue; private String registNumTypeValue;
@ApiModelProperty("挂靠其他资料list") @ApiModelProperty("营业执照附件list")
private List<BaseAffiliatCompanyAppendixVo> list; private List<BaseAffiliatCompanyAppendixVo> yyzzList;
@ApiModelProperty("道路运输许可证附件list")
private List<BaseAffiliatCompanyAppendixVo> dlysxkzList;
@ApiModelProperty("法人身份证附件list")
private List<BaseAffiliatCompanyAppendixVo> frsfzList;
@ApiModelProperty("其他资料list")
private List<BaseAffiliatCompanyAppendixVo> qtzlList;
@ApiModelProperty("登记注册号码(陕汽必须字段)") @ApiModelProperty("登记注册号码(陕汽必须字段)")
private String registNum; private String registNum;

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompany/BaseAffiliatCompanyFeign.java

@ -68,5 +68,4 @@ public interface BaseAffiliatCompanyFeign {
@GetMapping("/salesOrderNamesDown") @GetMapping("/salesOrderNamesDown")
ResultBean<List<Map<String, Object>>> salesOrderNamesDown(@RequestParam(value = "name", required = false) String name, ResultBean<List<Map<String, Object>>> salesOrderNamesDown(@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "staffSid", required = true) String staffSid); @RequestParam(value = "staffSid", required = true) String staffSid);
} }

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaffiliatcompanyappendix/BaseAffiliatCompanyAppendixDto.java

@ -12,7 +12,8 @@ public class BaseAffiliatCompanyAppendixDto implements Dto {
private static final long serialVersionUID = 243632007963991525L; private static final long serialVersionUID = 243632007963991525L;
@ApiModelProperty("文件名") @ApiModelProperty("文件名")
private String fileName; private String fileName;
@ApiModelProperty("上传人姓名")
private String name;
@ApiModelProperty("文件类型") @ApiModelProperty("文件类型")
private String fileType; private String fileType;
@ApiModelProperty(value = "文件的路径") @ApiModelProperty(value = "文件的路径")

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListVo.java

@ -59,6 +59,7 @@ public class BaseModelConfigListVo implements Vo {
private String independentSources; private String independentSources;
private String fuelTank; private String fuelTank;
private String multimedia; private String multimedia;
@ApiModelProperty(value = "厂家结算价")
private String manufactorSettlementPrice;
} }

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfig.java

@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
@ -68,6 +69,9 @@ public class BaseVehmodelConfig extends BaseEntity {
@ApiModelProperty("价格有效期") @ApiModelProperty("价格有效期")
private String priceValidity; // 价格有效期 private String priceValidity; // 价格有效期
@ApiModelProperty("销售指导价")
private BigDecimal guidedPrice; // 销售指导价
@ApiModelProperty(value = "是否常用车型") @ApiModelProperty(value = "是否常用车型")
private Integer isCommonModel; private Integer isCommonModel;

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java

@ -65,7 +65,7 @@ public class BaseVehmodelConfigDto implements Dto {
private BigDecimal salesReferencePrice; // 销售参考价 private BigDecimal salesReferencePrice; // 销售参考价
@ApiModelProperty("销售指导价") @ApiModelProperty("销售指导价")
@NotBlank(message = "销售指导价不能为空") @NotBlank(message = "销售指导价不能为空")
private String guidedPrice; // 销售指导价 private BigDecimal guidedPrice; // 销售指导价
@ApiModelProperty("价格有效期") @ApiModelProperty("价格有效期")
private String priceValidity; // 价格有效期 private String priceValidity; // 价格有效期
@ApiModelProperty(value = "是否常用车型") @ApiModelProperty(value = "是否常用车型")

21
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java

@ -17,6 +17,7 @@ import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -121,6 +122,10 @@ public class BaseAffiliatCompanyService extends MybatisBaseService<BaseAffiliatC
public BaseAffiliatCompanyDetailsVo details(String sid) { public BaseAffiliatCompanyDetailsVo details(String sid) {
BaseAffiliatCompany baseAffiliatCompany = fetchBySid(sid); BaseAffiliatCompany baseAffiliatCompany = fetchBySid(sid);
BaseAffiliatCompanyDetailsVo baseAffiliatCompanyDetailsVo = baseMapper.details(sid); BaseAffiliatCompanyDetailsVo baseAffiliatCompanyDetailsVo = baseMapper.details(sid);
ArrayList<BaseAffiliatCompanyAppendixVo> yyzzList = new ArrayList<>();
ArrayList<BaseAffiliatCompanyAppendixVo> dlysxkzList = new ArrayList<>();
ArrayList<BaseAffiliatCompanyAppendixVo> frsfzList = new ArrayList<>();
ArrayList<BaseAffiliatCompanyAppendixVo> qtzlList = new ArrayList<>();
if (baseAffiliatCompanyDetailsVo!=null){ if (baseAffiliatCompanyDetailsVo!=null){
String path = ""; String path = "";
List<BaseAffiliatCompanyAppendixVo> list = companyAppendixService.selByLinkSid(sid); List<BaseAffiliatCompanyAppendixVo> list = companyAppendixService.selByLinkSid(sid);
@ -129,9 +134,21 @@ public class BaseAffiliatCompanyService extends MybatisBaseService<BaseAffiliatC
String urlPrefix = fileUploadComponent.getUrlPrefix(); String urlPrefix = fileUploadComponent.getUrlPrefix();
path = urlPrefix + filePath; path = urlPrefix + filePath;
baseAffiliatCompanyAppendixVo.setFileUrl(path); baseAffiliatCompanyAppendixVo.setFileUrl(path);
String attachType = baseAffiliatCompanyAppendixVo.getAttachType();
if (attachType.equals(0001)){
yyzzList.add(baseAffiliatCompanyAppendixVo);
}else if (attachType.equals(0002)){
dlysxkzList.add(baseAffiliatCompanyAppendixVo);
}else if (attachType.equals(0003)){
frsfzList.add(baseAffiliatCompanyAppendixVo);
}else if (attachType.equals(0004)){
qtzlList.add(baseAffiliatCompanyAppendixVo);
}
} }
baseAffiliatCompanyDetailsVo.setList(list); baseAffiliatCompanyDetailsVo.setYyzzList(yyzzList);
baseAffiliatCompanyDetailsVo.setDlysxkzList(dlysxkzList);
baseAffiliatCompanyDetailsVo.setFrsfzList(frsfzList);
baseAffiliatCompanyDetailsVo.setQtzlList(qtzlList);
} }
if (StringUtils.isNotBlank(baseAffiliatCompany.getUseOrg())) { //使用组织sid if (StringUtils.isNotBlank(baseAffiliatCompany.getUseOrg())) { //使用组织sid
List<String> list = Arrays.asList(baseAffiliatCompany.getUseOrg().split(",")); List<String> list = Arrays.asList(baseAffiliatCompany.getUseOrg().split(","));

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@ -320,6 +320,7 @@
bc.multimedia, bc.multimedia,
bc.carColor, bc.carColor,
bvc.guidedPrice, bvc.guidedPrice,
bvc.manufactorSettlementPrice,
bvc.priceValidity, bvc.priceValidity,
(SELECT count(*) (SELECT count(*)
FROM base_vehicle bv FROM base_vehicle bv

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeign.java

@ -36,7 +36,7 @@ public interface DictCommonFeign {
@PostMapping("/update/{sid}") @PostMapping("/update/{sid}")
@ResponseBody @ResponseBody
@ApiOperation(value = "数据字典修改后保存") @ApiOperation(value = "数据字典修改后保存")
ResultBean update(@Valid DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid); ResultBean update(@Valid @RequestBody DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid);
@ResponseBody @ResponseBody
@DeleteMapping("/delete/{sid}") @DeleteMapping("/delete/{sid}")

23
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/QrCodeVo.java

@ -0,0 +1,23 @@
package com.yxt.anrui.portal.api.sysorganization;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author dimengzhe
* @date 2020/11/3 16:19
* @description
*/
@Data
public class QrCodeVo {
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("单位名称")
private String organizationName;
@ApiModelProperty("部门地址")
private String address;
@ApiModelProperty("二维码图片地址")
private String qrFilePath;
@ApiModelProperty(value = "部门sid")
private String sid;
}

6
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@ -6,6 +6,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -113,4 +114,9 @@ public interface SysOrganizationFeign {
@ResponseBody @ResponseBody
@GetMapping("/selectListOne") @GetMapping("/selectListOne")
ResultBean<List<SysOrgListVo>> selectListOne(); ResultBean<List<SysOrgListVo>> selectListOne();
@PostMapping("/getQrCode/{sid}")
@ResponseBody
@ApiOperation("查看二维码")
public ResultBean<QrCodeVo> getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
} }

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@ -116,4 +116,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
public ResultBean<List<SysOrgListVo>> selectListOne() { public ResultBean<List<SysOrgListVo>> selectListOne() {
return null; return null;
} }
@Override
public ResultBean<QrCodeVo> getQrCode(String sid) {
return null;
}
} }

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeign.java

@ -78,6 +78,6 @@ public interface SysRoleFeign {
@PostMapping("/setIsEnable/{sid}/{isEnable}") @PostMapping("/setIsEnable/{sid}/{isEnable}")
@ResponseBody @ResponseBody
@ApiOperation(value = "设置是否可用:isEnable:1可用,0不可用") @ApiOperation(value = "设置是否可用:isEnable:1可用,0不可用")
public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") Integer isEnable); public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable);
} }

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeignFallback.java

@ -85,7 +85,7 @@ public class SysRoleFeignFallback implements SysRoleFeign {
} }
@Override @Override
public ResultBean setIsEnable(String sid, Integer isEnable) { public ResultBean setIsEnable(String sid, String isEnable) {
return null; return null;
} }
} }

4
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@ -173,5 +173,9 @@ public interface SysUserFeign {
@GetMapping("/selectUserInfoByUserSid/{userSid}") @GetMapping("/selectUserInfoByUserSid/{userSid}")
public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(@PathVariable("userSid") String userSid); public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(@PathVariable("userSid") String userSid);
@PostMapping("/setIsEnable/{sid}/{isEnable}")
@ResponseBody
@ApiOperation(value = "设置是否可用:isEnable:1可用,0不可用")
public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable);
} }

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@ -158,4 +158,9 @@ public class SysUserFeignFallback implements SysUserFeign {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/sysuser/selectUserInfoByUserSid无法访问"); return rb.setMsg("接口anrui_portal/sysuser/selectUserInfoByUserSid无法访问");
} }
@Override
public ResultBean setIsEnable(String sid, String isEnable) {
return null;
}
} }

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java

@ -58,6 +58,8 @@ public class SysUserVo implements Vo {
@ApiModelProperty("手机号") @ApiModelProperty("手机号")
private String mobile; private String mobile;
@ApiModelProperty(value = "禁用状态")
private String isEnable;
@ApiModelProperty("用户类型:1员工、2客户、3供应商") @ApiModelProperty("用户类型:1员工、2客户、3供应商")
private String userType; private String userType;

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@ -92,4 +92,8 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
* @return * @return
*/ */
SysOrganizationVo getUseOrgBySid(@Param("sid")String sid); SysOrganizationVo getUseOrgBySid(@Param("sid")String sid);
int updateQrCodePath(@Param("sid") String sid, @Param("path") String path);
QrCodeVo getQrCodeVo(@Param("sid") String sid);
} }

13
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@ -140,4 +140,17 @@
WHERE sid = #{sid} WHERE sid = #{sid}
And isDept = 1 And isDept = 1
</select> </select>
<update id="updateQrCodePath">
UPDATE sys_organization
SET qrText = #{path}
WHERE sid = #{sid}
</update>
<select id="getQrCodeVo" resultType="com.yxt.anrui.portal.api.sysorganization.QrCodeVo">
SELECT so.name departmentName, so.qrText qrFilePath, so.addrs address, so.sid
FROM sys_organization so
WHERE so.sid = #{sid}
ORDER BY so.sort ASC
</select>
</mapper> </mapper>

36
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@ -5,6 +5,8 @@ import com.yxt.anrui.portal.api.sysorganization.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService; import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService; import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.QRCodeUtil;
import com.yxt.common.base.utils.StringUtils; import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
@ -15,11 +17,14 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static cn.hutool.poi.excel.sax.AttributeName.s;
/** /**
* Project: anrui_portal(门户建设) <br/> * Project: anrui_portal(门户建设) <br/>
* File: SysOrganizationFeignFallback.java <br/> * File: SysOrganizationFeignFallback.java <br/>
@ -44,6 +49,8 @@ public class SysOrganizationRest implements SysOrganizationFeign {
private SysStaffOrgService sysStaffOrgService; private SysStaffOrgService sysStaffOrgService;
@Autowired @Autowired
private SysStaffinfoService sysStaffinfoService; private SysStaffinfoService sysStaffinfoService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Override @Override
public ResultBean<PagerVo<SysOrganizationVo>> listPage(@RequestBody PagerQuery<SysOrganizationQuery> pq) { public ResultBean<PagerVo<SysOrganizationVo>> listPage(@RequestBody PagerQuery<SysOrganizationQuery> pq) {
@ -226,4 +233,33 @@ public class SysOrganizationRest implements SysOrganizationFeign {
return rb.success().setData(sysOrgListVo); return rb.success().setData(sysOrgListVo);
} }
@Override
public ResultBean<QrCodeVo> getQrCode(String sid) {
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
if (sysOrganization == null) {
return new ResultBean<QrCodeVo>().fail().setMsg("部门不存在");
}
if (StringUtils.isBlank(sysOrganization.getQrText())) {
File file = new File(fileUploadComponent.getUploadPath() + "qrCode");
QRCodeUtil.createCodeToFile(sysOrganization.getSid() + "#" + sysOrganization.getId() + "#" + "q", file, sysOrganization.getName() + sysOrganization.getId() + ".png");
//将该二维码地址放进部门表中的二维码图片地址中
String path = fileUploadComponent.getUrlPrefix() + "qrCode/" + sysOrganization.getName() + sysOrganization.getId() + ".png";
sysOrganizationService.updateQrCodePath(sid, path);
}
QrCodeVo qrCodeVo = sysOrganizationService.getQrCodeVo(sid);
String orgSidPath = sysOrganization.getOrgSidPath();
String[] split = orgSidPath.split("/");
for (String s : split) {
SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(s);
Integer isDept = sysOrganization1.getIsDept();
String psid = sysOrganization1.getPsid();
if (isDept != null){
if (isDept == 0 && !psid.equals(0)) {
qrCodeVo.setOrganizationName(sysOrganization1.getName());
break;
}
}
}
return new ResultBean<QrCodeVo>().success().setData(qrCodeVo);
}
} }

8
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@ -368,4 +368,12 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
} }
return sysOrganizationVo; return sysOrganizationVo;
} }
public int updateQrCodePath(String sid, String path) {
return baseMapper.updateQrCodePath(sid, path);
}
public QrCodeVo getQrCodeVo(String sid) {
return baseMapper.getQrCodeVo(sid);
}
} }

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java

@ -50,5 +50,5 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
SysRoleVo fetchBySid(String sid); SysRoleVo fetchBySid(String sid);
int updateIsEnable(@Param("sid") String sid, @Param("isEnable") Integer isEnable); int updateIsEnable(@Param("sid") String sid, @Param("isEnable") String isEnable);
} }

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleRest.java

@ -137,7 +137,7 @@ public class SysRoleRest implements SysRoleFeign {
} }
@Override @Override
public ResultBean setIsEnable(String sid, Integer isEnable) { public ResultBean setIsEnable(String sid, String isEnable) {
SysRole role = sysRoleService.fetchBySid(sid); SysRole role = sysRoleService.fetchBySid(sid);
if (role == null) { if (role == null) {
return ResultBean.fireFail().setMsg("此角色已不存在"); return ResultBean.fireFail().setMsg("此角色已不存在");

10
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java

@ -54,19 +54,19 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
if (StringUtils.isNotBlank(query.getName())) { if (StringUtils.isNotBlank(query.getName())) {
qw.like("name", query.getName()); qw.like("sr.name", query.getName());
} }
if (query.getSort() != null) { if (query.getSort() != null) {
qw.eq("sort", query.getSort()); qw.eq("sr.sort", query.getSort());
} }
if (StringUtils.isNotBlank(query.getCode())) { if (StringUtils.isNotBlank(query.getCode())) {
qw.eq("code", query.getCode()); qw.eq("sr.code", query.getCode());
} }
if (query.getType() != null) { if (query.getType() != null) {
qw.eq("type", query.getType()); qw.eq("sr.type", query.getType());
} }
return qw; return qw;
} }
@ -144,7 +144,7 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
return vo; return vo;
} }
public int updateIsEnable(String sid, Integer isEnable) { public int updateIsEnable(String sid, String isEnable) {
return baseMapper.updateIsEnable(sid, isEnable); return baseMapper.updateIsEnable(sid, isEnable);
} }
} }

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@ -153,4 +153,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* @return * @return
*/ */
SysUser selectByMobile(String mobile); SysUser selectByMobile(String mobile);
int updateIsEnable(@Param("sid") String sid, @Param("isEnable") String isEnable);
} }

7
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@ -5,6 +5,7 @@
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo"> <select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
SELECT DISTINCT user.staffSid, SELECT DISTINCT user.staffSid,
user.isEnable,
( (
SELECT GROUP_CONCAT(org.name) SELECT GROUP_CONCAT(org.name)
FROM sys_staff_org staffOrg FROM sys_staff_org staffOrg
@ -181,4 +182,10 @@
and isDelete = 0 and isDelete = 0
and userType = 1 and userType = 1
</select> </select>
<update id="updateIsEnable">
UPDATE sys_user
SET isEnable = #{isEnable}
WHERE sid = #{sid}
</update>
</mapper> </mapper>

20
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@ -3,6 +3,7 @@ package com.yxt.anrui.portal.biz.sysuser;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.syspost.SysPost; import com.yxt.anrui.portal.api.syspost.SysPost;
import com.yxt.anrui.portal.api.sysrole.SysRole;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -322,7 +323,7 @@ public class SysUserRest implements SysUserFeign {
String captcha = redisUtil.get(uuid); String captcha = redisUtil.get(uuid);
/* List<Map> list = JSONObject.parseArray(captcha, Map.class); /* List<Map> list = JSONObject.parseArray(captcha, Map.class);
if (StringUtils.isEmpty(verifyCode)) { /* if (StringUtils.isEmpty(verifyCode)) {
return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空"); return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
} }
@ -387,8 +388,8 @@ public class SysUserRest implements SysUserFeign {
isCorrect = true; isCorrect = true;
} else { } else {
return new ResultBean<SysUserVo>().fail().setMsg("验证码错误"); return new ResultBean<SysUserVo>().fail().setMsg("验证码错误");
} }*/
*/
if (StringUtils.isBlank(userName)) { if (StringUtils.isBlank(userName)) {
return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空"); return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
} }
@ -558,4 +559,17 @@ public class SysUserRest implements SysUserFeign {
} }
return rb.success().setData(sysUserInfoVo); return rb.success().setData(sysUserInfoVo);
} }
@Override
public ResultBean setIsEnable(String sid, String isEnable) {
SysUser sysUser = sysUserService.fetchBySid(sid);
if (sysUser == null) {
return ResultBean.fireFail().setMsg("此角色已不存在");
}
int i = sysUserService.updateIsEnable(sid, isEnable);
if (i == 0) {
return ResultBean.fireFail().setMsg("设置失败");
}
return ResultBean.fireSuccess().setMsg("设置成功");
}
} }

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@ -811,4 +811,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return null; return null;
} }
public int updateIsEnable(String sid, String isEnable) {
return baseMapper.updateIsEnable(sid, isEnable);
}
} }
Loading…
Cancel
Save