退料申请表数据问题修改
This commit is contained in:
parent
80f6ea3154
commit
5b0e807b29
|
|
@ -128,6 +128,13 @@ public class TokenController {
|
||||||
return R.ok(null,"注册成功");
|
return R.ok(null,"注册成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("loginByMall")
|
||||||
|
public R<?> loginByMall(@RequestBody LoginUser loginUser) {
|
||||||
|
// 用户注册
|
||||||
|
sysLoginService.loginByMall(loginUser);
|
||||||
|
return R.ok(null,"登录成功");
|
||||||
|
}
|
||||||
|
|
||||||
@ApiOperation("微服务平台认证接口")
|
@ApiOperation("微服务平台认证接口")
|
||||||
@PostMapping(value = "/onlineApprove")
|
@PostMapping(value = "/onlineApprove")
|
||||||
public R<?> onlineApprove(@RequestBody AuthenticationLoginFrom loginForm) {
|
public R<?> onlineApprove(@RequestBody AuthenticationLoginFrom loginForm) {
|
||||||
|
|
|
||||||
|
|
@ -230,4 +230,9 @@ public class SysLoginService {
|
||||||
}
|
}
|
||||||
recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
|
recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void loginByMall(LoginUser loginUser) {
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -489,6 +489,7 @@ public class TmTaskServiceImpl implements TmTaskService {
|
||||||
List<LeaseApplyInfo> applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId)).collect(Collectors.toList());
|
List<LeaseApplyInfo> applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId)).collect(Collectors.toList());
|
||||||
if (CollUtil.isNotEmpty(applyInfoList)) {
|
if (CollUtil.isNotEmpty(applyInfoList)) {
|
||||||
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
|
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
|
||||||
|
taskId = leaseApplyInfo.getTaskId();
|
||||||
if (leaseApplyInfo != null) {
|
if (leaseApplyInfo != null) {
|
||||||
//leaseApplyInfo.setExamineStatusId(record.getExamineStatusId());
|
//leaseApplyInfo.setExamineStatusId(record.getExamineStatusId());
|
||||||
result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo);
|
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());
|
List<LeaseApplyInfo> applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId)).collect(Collectors.toList());
|
||||||
if (CollUtil.isNotEmpty(applyInfoList)) {
|
if (CollUtil.isNotEmpty(applyInfoList)) {
|
||||||
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
|
for (LeaseApplyInfo leaseApplyInfo : applyInfoList) {
|
||||||
|
taskId = leaseApplyInfo.getTaskId();
|
||||||
if (leaseApplyInfo != null) {
|
if (leaseApplyInfo != null) {
|
||||||
//leaseApplyInfo.setExamineStatusId(record.getExamineStatusId());
|
//leaseApplyInfo.setExamineStatusId(record.getExamineStatusId());
|
||||||
result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo);
|
result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo);
|
||||||
|
|
|
||||||
|
|
@ -724,7 +724,7 @@
|
||||||
</if>
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
WHERE
|
WHERE
|
||||||
task_id = #{record.taskId}
|
task_id = #{record.taskId} and company_id = #{record.companyId}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<update id="updateLeaseApplyDetailsAuditInfo">
|
<update id="updateLeaseApplyDetailsAuditInfo">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue