Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

workplace
wangwei 10 months ago
commit 47ea535377

@ -3,6 +3,7 @@ package com.glxp.api.controller.basic;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.BasicCollectPointEntity; import com.glxp.api.entity.basic.BasicCollectPointEntity;
import com.glxp.api.entity.basic.BasicCollectUserEntity; import com.glxp.api.entity.basic.BasicCollectUserEntity;
import com.glxp.api.req.basic.BasicCollectRequest; import com.glxp.api.req.basic.BasicCollectRequest;
@ -28,13 +29,16 @@ import java.util.List;
*/ */
@Slf4j @Slf4j
@RestController @RestController
public class BasicCollectUserController { public class BasicCollectUserController extends BaseController {
@Resource @Resource
private BasicCollectUserService basicCollectUserService; private BasicCollectUserService basicCollectUserService;
@GetMapping("/udiwms/sysWorkplace/getUserBindWork") @GetMapping("/udiwms/sysWorkplace/getUserBindWork")
public BaseResponse getUserBindWork(BasicCollectUserRequest request) { public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1){
request.setUserId(String.valueOf(getUserId()));
}
List<UserWorkResponse> page = basicCollectUserService.filterList(request); List<UserWorkResponse> page = basicCollectUserService.filterList(request);
PageInfo<UserWorkResponse> pageInfo = new PageInfo<>(page); PageInfo<UserWorkResponse> pageInfo = new PageInfo<>(page);
PageSimpleResponse<UserWorkResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UserWorkResponse> pageSimpleResponse = new PageSimpleResponse<>();

@ -21,5 +21,7 @@ public class BasicCollectUserRequest extends ListPageRequest {
private String userKey; private String userKey;
private String workKey; private String workKey;
private Integer autoUserId;
} }

@ -13,7 +13,7 @@
and invCode = #{invCode} and invCode = #{invCode}
</if> </if>
</where> </where>
ORDER BY id DESC ORDER BY code
</select> </select>
<select id="selectAll" resultType="com.glxp.api.entity.basic.BasicCollectPointCategory"> <select id="selectAll" resultType="com.glxp.api.entity.basic.BasicCollectPointCategory">
SELECT * SELECT *

@ -30,5 +30,6 @@
AND ggxh LIKE concat('%', #{ggxh}, '%') AND ggxh LIKE concat('%', #{ggxh}, '%')
</if> </if>
</where> </where>
group by icob.id
</select> </select>
</mapper> </mapper>

@ -26,5 +26,6 @@
AND icocm.bizIdFk = #{bizIdFk} AND icocm.bizIdFk = #{bizIdFk}
</if> </if>
</where> </where>
group by icocm.id
</select> </select>
</mapper> </mapper>

Loading…
Cancel
Save