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 16:02:01 +08:00
parent 80f6ea3154
commit 5b0e807b29
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,6 +128,13 @@ public class TokenController {
return R.ok(null,"注册成功");
}
@PostMapping("loginByMall")
public R<?> loginByMall(@RequestBody LoginUser loginUser) {
// 用户注册
sysLoginService.loginByMall(loginUser);
return R.ok(null,"登录成功");
}
@ApiOperation("微服务平台认证接口")
@PostMapping(value = "/onlineApprove")
public R<?> onlineApprove(@RequestBody AuthenticationLoginFrom loginForm) {

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

@ -230,4 +230,9 @@ public class SysLoginService {
}
recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
}
public void loginByMall(LoginUser loginUser) {
}
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -489,6 +489,7 @@ public class TmTaskServiceImpl implements TmTaskService {
List<LeaseApplyInfo> applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId)).collect(Collectors.toList());
if (CollUtil.isNotEmpty(applyInfoList)) {
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
taskId = leaseApplyInfo.getTaskId();
if (leaseApplyInfo != null) {
//leaseApplyInfo.setExamineStatusId(record.getExamineStatusId());
result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo);
@ -529,6 +530,7 @@ public class TmTaskServiceImpl implements TmTaskService {
List<LeaseApplyInfo> applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId)).collect(Collectors.toList());
if (CollUtil.isNotEmpty(applyInfoList)) {
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
taskId = leaseApplyInfo.getTaskId();
if (leaseApplyInfo != null) {
//leaseApplyInfo.setExamineStatusId(record.getExamineStatusId());
result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo);

2
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -724,7 +724,7 @@
</if>
</trim>
WHERE
task_id = #{record.taskId}
task_id = #{record.taskId} and company_id = #{record.companyId}
</update>
<update id="updateLeaseApplyDetailsAuditInfo">