调整:sql问题

dev
masong 2 years ago
parent 057ce3e0b4
commit 1e06e5e8f3
  1. 2
      cjy-project/src/main/java/com/cjy/enterprise/controller/SchedulingPersonController.java
  2. 2
      cjy-project/src/main/resources/mapper/enterprise/SchedulingPersonMapper.xml
  3. 2
      ruoyi-ui/vue.config.js

@ -38,7 +38,6 @@ public class SchedulingPersonController extends BaseController
/**
* 查询人员排班信息 列表
*/
@PreAuthorize("@ss.hasPermi('enterprise:scheduling-person:list')")
@GetMapping("/list")
public TableDataInfo list(SchedulingPerson schedulingPerson)
{
@ -63,7 +62,6 @@ public class SchedulingPersonController extends BaseController
/**
* 获取人员排班信息 详细信息
*/
@PreAuthorize("@ss.hasPermi('enterprise:scheduling-person:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{

@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<select id="selectSchedulingTimeByUserIdAndTime" resultType="java.util.Map">
select t1.id as schedulingPersonId, t1.scheduling_time as schedulingTime,(select t2.name from ti_scheduling t2 where t2.id = t1. scheduling_id) as schedulingName from ti_scheduling_person t1
select t1.id as schedulingPersonId, t1.scheduling_time as schedulingTime,t1.scheduling_id as schedulingId,(select t2.name from ti_scheduling t2 where t2.id = t1. scheduling_id) as schedulingName from ti_scheduling_person t1
where t1.user_id=#{userId} and t1.scheduling_time like concat(#{time},'%')
</select>

@ -36,7 +36,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023!
target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023!
target: `http://127.0.0.1:8080/`,//用户名:cjyadmin/密码:CJYjqgk@2023!
// target: `http://192.168.130.157:8080/`,//用户名:admin 密码Cjy@123abcc
changeOrigin: true,
pathRewrite: {

Loading…
Cancel
Save