Merge remote-tracking branch 'origin/main'
# Conflicts: # bonus-modules/bonus-base/src/main/java/com/bonus/base/common/utils/TypeCodeUtils.java
This commit is contained in:
commit
afcde35ee8
|
|
@ -95,7 +95,7 @@ public class ProDepartController extends BaseController {
|
|||
|
||||
@ApiOperation(value = "设置项目部状态")
|
||||
// @PreventRepeatSubmit
|
||||
@RequiresPermissions("basic:depart:editStatus")
|
||||
// @RequiresPermissions("basic:depart:editStatus")
|
||||
@SysLog(title = "项目部管理", businessType = OperaType.UPDATE, logType = 1,module = "项目部管理->设置项目部状态")
|
||||
@PostMapping("editDepartStatus")
|
||||
public AjaxResult editDepartStatus(@RequestBody ProDepartVo vo) {
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ public class TtSysTeamController extends BaseController {
|
|||
}
|
||||
|
||||
@ApiOperation(value = "查询班组下拉选·")
|
||||
@PostMapping("querySelected")
|
||||
@PostMapping("/querySelected")
|
||||
public AjaxResult querySelected() {
|
||||
return ttSysTeamService.querySelected();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,10 +13,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
|
|||
import com.bonus.common.security.annotation.RequiresPermissions;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
|
@ -138,4 +135,17 @@ public class TtSysUserController extends BaseController {
|
|||
return error("查询人员列表失败");
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询班组长列表")
|
||||
@GetMapping("/getTeamUserList")
|
||||
public AjaxResult getTeamUserList() {
|
||||
try {
|
||||
|
||||
List<TtSysUserVo> ttSysUserVoList = ttSysUserService.getTeamUserList();
|
||||
return success(ttSysUserVoList);
|
||||
}catch (Exception e){
|
||||
log.info("查询人员列表失败",e.getMessage());
|
||||
return error("查询人员列表失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,4 +19,6 @@ public interface TtSysUserMapper {
|
|||
void updateTtSysUser(TtSysUserVo ttSysUserVo);
|
||||
|
||||
void deleteTtSysUser(TtSysUserVo ttSysUserVo);
|
||||
|
||||
List<TtSysUserVo> getTeamUserList(String workType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,4 +64,10 @@ public interface TtSysUserService {
|
|||
* @param ttSysUserVo
|
||||
*/
|
||||
void deleteTtSysUser(TtSysUserVo ttSysUserVo);
|
||||
|
||||
/**
|
||||
* 查询班组长列表
|
||||
* @return
|
||||
*/
|
||||
List<TtSysUserVo> getTeamUserList();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import com.bonus.base.basic.domain.vo.TtSysUserVo;
|
|||
import com.bonus.base.basic.mapper.TtSysUserMapper;
|
||||
import com.bonus.base.basic.service.TtPersonnelEntryExitService;
|
||||
import com.bonus.base.basic.service.TtSysUserService;
|
||||
import com.bonus.base.common.utils.TypeCodeUtils;
|
||||
import com.bonus.common.core.utils.IDUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
@ -122,7 +123,7 @@ public class TtSysUserServiceImpl implements TtSysUserService {
|
|||
ttPersonnelEntryExitVo.setWorkType(ttSysUserVo.getWorkType());
|
||||
ttPersonnelEntryExitVo.setEntryDate(new Date());
|
||||
ttPersonnelEntryExitVo.setStatus(ttSysUserVo.getStatus());
|
||||
ttPersonnelEntryExitService.addTtPersonnelEntryExit(ttPersonnelEntryExitVo);
|
||||
ttPersonnelEntryExitService.updateTtPersonnelEntryExit(ttPersonnelEntryExitVo);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -157,4 +158,15 @@ public class TtSysUserServiceImpl implements TtSysUserService {
|
|||
//修改用户信息
|
||||
ttSysUserMapper.deleteTtSysUser(ttSysUserVo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询班组长列表
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<TtSysUserVo> getTeamUserList() {
|
||||
//获取人员列表
|
||||
List<TtSysUserVo> ttSysUserList = ttSysUserMapper.getTeamUserList(TypeCodeUtils.BZFZR_CODE);
|
||||
return ttSysUserList;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public class TypeCodeUtils {
|
|||
|
||||
|
||||
/**
|
||||
* 大体积混凝土
|
||||
* 深基坑监测
|
||||
*/
|
||||
public final static String SJK_CODE="9000300";
|
||||
|
||||
|
|
@ -32,6 +32,10 @@ public class TypeCodeUtils {
|
|||
*/
|
||||
public final static String BALL_CODE="ball_0";
|
||||
|
||||
/**
|
||||
* 班组负责人
|
||||
*/
|
||||
public final static String BZFZR_CODE="09001007";
|
||||
|
||||
/**
|
||||
* 环境监测设备类型id
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
use_status AS useStatus,
|
||||
remark
|
||||
FROM tb_pro_depart
|
||||
WHERE is_active = '1'
|
||||
WHERE id = #{id} AND is_active = '1'
|
||||
</select>
|
||||
<!--查询项目部-->
|
||||
<select id="getDeparts" resultType="com.bonus.base.basic.domain.vo.ProDepartVo">
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<update id="updateTtPersonnelEntryExit">
|
||||
update tt_personnel_entry_exit
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="workType != null">work_type = #{workType},</if>
|
||||
<if test="lotId != null">lot_id = #{lotId},</if>
|
||||
<if test="exitDate != null">exit_date = #{exitDate},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
</trim>
|
||||
|
|
|
|||
|
|
@ -111,13 +111,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
tsu.work_type as workType,tsu.birthday as birthday,tsu.sex as sex,tsu.nationality as nationality,
|
||||
tsu.address as address,tsu.iss_auth as issAuth,tsu.start_time as startTime,tsu.end_time as endTime,
|
||||
tsu.photos as photos,tsu.status as status,tsu.key_personnel as keyPersonnel,
|
||||
tsu2.unit_name as unitName,sdd.dict_label
|
||||
tsu2.unit_name as unitName,sdd.dict_label,tsu.age as age
|
||||
from tt_sys_user tsu
|
||||
left join tt_sys_unit tsu2 on tsu.unit_id = tsu2.id
|
||||
|
||||
|
||||
left JOIN sys_dict_data sdd on sdd.dict_value=tsu.work_type
|
||||
left JOIN sys_dict_data sdd2 on sdd2.dict_value=tsu.post_unit and sd2.dict_type
|
||||
left JOIN sys_dict_data sdd2 on sdd2.dict_value=tsu.post_unit
|
||||
|
||||
where del_flag=1
|
||||
<if test="id != null"> and tsu.id = #{id}</if>
|
||||
|
|
@ -133,4 +133,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
)
|
||||
</if>
|
||||
</select>
|
||||
<select id="getTeamUserList" resultType="com.bonus.base.basic.domain.vo.TtSysUserVo">
|
||||
select id as id,user_name as userName,user_phone as userPhone,id_car as idCar, unit_id as unitId,
|
||||
team_id as teamId,car_image as carImage,post_unit as postUnit,work_type as workType,
|
||||
birthday as birthday,sex as sex,nationality as nationality,address as address,iss_auth as issAuth,
|
||||
start_time as startTime,end_time as endTime,photos as photos,status as status
|
||||
from tt_sys_user where work_type = #{workType}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue