权限管理
This commit is contained in:
parent
e20079f303
commit
d66335a152
|
|
@ -113,7 +113,7 @@ public class PmSubTeamController extends BaseController {
|
||||||
@SysLog(title = "分包班组信息管理", businessType = OperaType.QUERY, logType = 0, module = "分包班组信息管理->分包班组信息列表")
|
@SysLog(title = "分包班组信息管理", businessType = OperaType.QUERY, logType = 0, module = "分包班组信息管理->分包班组信息列表")
|
||||||
public TableDataInfo listAll(PmSubTeam pmSubTeam) {
|
public TableDataInfo listAll(PmSubTeam pmSubTeam) {
|
||||||
try {
|
try {
|
||||||
List<PmSubTeam> list = pmSubTeamService.selectSubTeamList(pmSubTeam);
|
List<PmSubTeam> list = pmSubTeamService.selectSubTeamListAll(pmSubTeam);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error(e.toString(), e);
|
log.error(e.toString(), e);
|
||||||
|
|
|
||||||
|
|
@ -25,4 +25,6 @@ public interface PmSubTeamMapper {
|
||||||
* 删除分包班组信息
|
* 删除分包班组信息
|
||||||
*/
|
*/
|
||||||
int delSubTeam(PmSubTeam pmSubTeam);
|
int delSubTeam(PmSubTeam pmSubTeam);
|
||||||
|
|
||||||
|
List<PmSubTeam> selectSubTeamListAll(PmSubTeam pmSubTeam);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,4 +19,6 @@ public interface PmSubTeamService {
|
||||||
* 删除分包班组信息
|
* 删除分包班组信息
|
||||||
*/
|
*/
|
||||||
int delSubTeam(PmSubTeam pmSubTeam);
|
int delSubTeam(PmSubTeam pmSubTeam);
|
||||||
|
|
||||||
|
List<PmSubTeam> selectSubTeamListAll(PmSubTeam pmSubTeam);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ public class PmSubTeamContractServiceImpl implements PmSubTeamContractService {
|
||||||
pmSubTeamContract.setUpdateTime(new Date());
|
pmSubTeamContract.setUpdateTime(new Date());
|
||||||
pmSubTeamContract.setTeamExitTime(DateUtils.getDate());
|
pmSubTeamContract.setTeamExitTime(DateUtils.getDate());
|
||||||
//查看下面的人员是否全部出场
|
//查看下面的人员是否全部出场
|
||||||
List<PmWorker> pmWorkerList = pmSubTeamContractMapper.getPmWorkerByTeamId(pmSubTeamContract.getId());
|
List<PmWorker> pmWorkerList = pmSubTeamContractMapper.getPmWorkerByTeamId(pmSubTeamContract.getTeamId());
|
||||||
if (pmWorkerList.size()>0){
|
if (pmWorkerList.size()>0){
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,4 +58,9 @@ public class PmSubTeamServiceImpl implements PmSubTeamService {
|
||||||
public int delSubTeam(PmSubTeam pmSubTeam) {
|
public int delSubTeam(PmSubTeam pmSubTeam) {
|
||||||
return pmSubTeamMapper.delSubTeam(pmSubTeam);
|
return pmSubTeamMapper.delSubTeam(pmSubTeam);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<PmSubTeam> selectSubTeamListAll(PmSubTeam pmSubTeam) {
|
||||||
|
return pmSubTeamMapper.selectSubTeamListAll(pmSubTeam);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,12 +35,12 @@
|
||||||
|
|
||||||
<select id="selectSubTeamList" resultType="com.bonus.bmw.domain.po.PmSubTeam">
|
<select id="selectSubTeamList" resultType="com.bonus.bmw.domain.po.PmSubTeam">
|
||||||
select pst.id as id,
|
select pst.id as id,
|
||||||
pst.team_name as teamName,
|
pst.team_name as teamName,
|
||||||
pst.sub_id as subId,
|
pst.sub_id as subId,
|
||||||
ps.sub_name as subName,
|
ps.sub_name as subName,
|
||||||
pst.team_leader as teamLeader,
|
pst.team_leader as teamLeader,
|
||||||
pst.phone as phone,
|
pst.phone as phone,
|
||||||
pst.team_ein_status as teamEinStatus
|
pst.team_ein_status as teamEinStatus
|
||||||
from pm_sub_team pst
|
from pm_sub_team pst
|
||||||
left join pm_sub ps on ps.id = pst.sub_id
|
left join pm_sub ps on ps.id = pst.sub_id
|
||||||
where pst.is_active = '1'
|
where pst.is_active = '1'
|
||||||
|
|
@ -53,4 +53,13 @@
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
<select id="selectSubTeamListAll" resultType="com.bonus.bmw.domain.po.PmSubTeam">
|
||||||
|
select pst.id as id,
|
||||||
|
pst.team_name as teamName
|
||||||
|
from pm_sub_team pst
|
||||||
|
where pst.is_active = '1'
|
||||||
|
<if test="subId !=null and subId!= ''" >
|
||||||
|
and pst.sub_id=#{subId}
|
||||||
|
</if>
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue