bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料申请表数据问题修改

This commit is contained in:
liang.chao 2024-02-27 18:06:01 +08:00
parent 15c8119f94
commit 3878c5a23f
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
View File

@ -68,6 +68,7 @@ public class TokenController {
/**
* App端登录
*
* @param form
* @return
*/
@ -125,13 +126,19 @@ public class TokenController {
public R<?> register(@RequestBody RegisterBody registerBody) {
// 用户注册
sysLoginService.register(registerBody);
return R.ok(null,"注册成功");
return R.ok(null, "注册成功");
}
@PostMapping("loginByMall")
public R<?> loginByMall(@RequestBody LoginUser loginUser) {
// 用户注册
return R.ok(sysLoginService.loginByMall(loginUser));
Map map = sysLoginService.loginByMall(loginUser);
if ("1".equals(map.get("status").toString())) {
return R.fail("登录用户未注册");
} else if ("2".equals(map.get("login_user").toString())) {
return R.fail("未携带token");
}
return R.ok(map);
}
@ApiOperation("微服务平台认证接口")

6
sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java
View File

@ -247,14 +247,14 @@ public class SysLoginService {
// 表示商城登录该系统的标识
if (StringUtils.isNotBlank(token)) {
R<LoginUser> userInfo = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
if (ObjectUtils.isNotEmpty(userInfo.getData())) {
if (ObjectUtils.isNotEmpty(userInfo.getData()) && userInfo.getCode() == 200) {
return tokenService.createToken(userInfo.getData());
} else {
hashMap.put("login_user", "该用户未注册");
hashMap.put("status", "1");
return hashMap;
}
} else {
hashMap.put("login_user", "token为空");
hashMap.put("status", "2");
return hashMap;
}
}

1
sgzb-common/sgzb-common-security/src/main/java/com/bonus/sgzb/common/security/service/TokenService.java
View File

@ -70,6 +70,7 @@ public class TokenService
//密码置空后返回
loginUser.getSysUser().setPassword("");
rspMap.put("login_user", loginUser);
rspMap.put("status", "0");
return rspMap;
}

9
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -61,7 +61,7 @@ public class BackApplyServiceImpl implements BackApplyService {
List<BackApplyInfo> backApplyListByAdmin = backApplyMapper.getBackApplyListByAdmin(bean);
//机具分公司只能看到机具公司的退料
if (CollUtil.isNotEmpty(backApplyListByAdmin)) {
if (roles.contains("sgb") || roles.contains("jjfgs")) {
if (roles.contains("jjfgs")) {
for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) {
backApplyInfos.add(backApplyInfo);
@ -71,7 +71,7 @@ public class BackApplyServiceImpl implements BackApplyService {
}
//调试分公司只能看到调试公司的退料
if (CollUtil.isNotEmpty(backApplyListByAdmin)) {
if (roles.contains("ajb") || roles.contains("tsfgs")) {
if (roles.contains("tsfgs")) {
for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) {
backApplyInfos.add(backApplyInfo);
@ -162,6 +162,7 @@ public class BackApplyServiceImpl implements BackApplyService {
public AjaxResult audit(BackApplyInfo bean) {
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
String username = SecurityUtils.getLoginUser().getUsername();
Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
int num = 0;
if (!StringUtils.isEmpty(bean.getIds())) {
String[] ids = bean.getIds().split(",");
@ -169,7 +170,7 @@ public class BackApplyServiceImpl implements BackApplyService {
String id = ids[i];
bean.setId(Long.valueOf(id));
if (roles.contains("jjfgs") || roles.contains("admin")) {
bean.setCompanyId("101");
bean.setCompanyId(companyId.toString());
bean.setCreateBy(username);
bean.setStatus("1");
int re = backApplyMapper.audit(bean);
@ -178,7 +179,7 @@ public class BackApplyServiceImpl implements BackApplyService {
}
}
if (roles.contains("tsfgs") || roles.contains("admin")) {
bean.setCompanyId("102");
bean.setCompanyId(companyId.toString());
bean.setCreateBy(username);
bean.setStatus("2");
int re = backApplyMapper.audit(bean);

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
UPDATE tm_task tt
LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
SET bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status=#{status},bai.direct_audit_time=NOW()
SET bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW()
WHERE
bai.id = #{id}
<if test="companyId != null and companyId != ''">