Compare commits
3 Commits
994d050ba8
...
539c46bbab
| Author | SHA1 | Date |
|---|---|---|
|
|
539c46bbab | |
|
|
22232fbbf7 | |
|
|
0e62f212ef |
|
|
@ -226,12 +226,7 @@ public class BackReceiveController extends BaseController {
|
|||
@PostMapping("/endBack")
|
||||
public AjaxResult endBack(@RequestBody BackApplyInfo record) {
|
||||
try {
|
||||
int res = backReceiveService.endBack(record);
|
||||
if (res > 0) {
|
||||
return AjaxResult.success("接收成功");
|
||||
} else {
|
||||
return AjaxResult.error("接收失败");
|
||||
}
|
||||
return AjaxResult.success(backReceiveService.endBack(record));
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -976,7 +976,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
bpl.lot_name as lotName,
|
||||
bui.unit_id as unitId,
|
||||
bui.unit_name as unitName,
|
||||
bai.back_time as backTime,
|
||||
bai.create_time as backTime,
|
||||
bagi.agreement_code as agreementCode,
|
||||
tt.task_status as taskStatus,
|
||||
tta.agreement_id as agreementId,
|
||||
|
|
@ -1020,7 +1020,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
and bagi.agreement_code like concat('%', #{agreementCode}, '%')
|
||||
</if>
|
||||
<if test="time != null and time != ''">
|
||||
and bai.back_time =#{time}
|
||||
and DATE(bai.create_time) = #{time}
|
||||
</if>
|
||||
<if test="backSource != null and backSource != ''">
|
||||
and bai.back_source =#{backSource}
|
||||
|
|
|
|||
|
|
@ -568,8 +568,8 @@ public class SysUserServiceImpl implements ISysUserService {
|
|||
public List<SysUser> urgentProcessingUser(UrgentProcessingUser urgentProcessingUser) {
|
||||
log.info("ToDoServiceImpl urgentProcessingUser {} begin", urgentProcessingUser);
|
||||
// 验证是否为空
|
||||
if (urgentProcessingUser == null || urgentProcessingUser.getTaskStatus() == null) {
|
||||
throw new ServiceException(SystemException.TASK_ID_IS_EMPTY_MSG, SystemException.TASK_ID_IS_EMPTY);
|
||||
if (urgentProcessingUser == null || org.apache.commons.lang3.StringUtils.isBlank(urgentProcessingUser.getTaskStatus())) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
List<SysUser> userList = new ArrayList<>();
|
||||
SysUser sysUser = new SysUser();
|
||||
|
|
|
|||
Loading…
Reference in New Issue