소스 검색

组织管理分页查询车牌findAll,组织人员管理loginUserId添加

master
耀灵 3 년 전
부모
커밋
02ea352321

+ 2
- 1
src/manager/cn/com/yskj/zfdm/manager/organizationpersonnel/OrganizationPersonnelManager.java 파일 보기



import cn.com.taiji.common.manager.ManagerException; import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.model.dao.Pagination; import cn.com.taiji.common.model.dao.Pagination;
import cn.com.yskj.zfdm.entity.User;
import cn.com.yskj.zfdm.entity.zfd.OrganizationPersonnel; import cn.com.yskj.zfdm.entity.zfd.OrganizationPersonnel;
import cn.com.yskj.zfdm.model.organizationpersonnel.OrganizationPersonnelModel; import cn.com.yskj.zfdm.model.organizationpersonnel.OrganizationPersonnelModel;
import cn.com.yskj.zfdm.repo.request.organizationpersonnel.OrganizationPersonnelPageRequest; import cn.com.yskj.zfdm.repo.request.organizationpersonnel.OrganizationPersonnelPageRequest;
Pagination queryPage(OrganizationPersonnelPageRequest queryModel); Pagination queryPage(OrganizationPersonnelPageRequest queryModel);


//添加方法 //添加方法
void add(@Valid OrganizationPersonnelModel opm)throws ManagerException;
void add(@Valid OrganizationPersonnelModel opm,User user)throws ManagerException;
//通过id查询 //通过id查询
OrganizationPersonnel findById(String id); OrganizationPersonnel findById(String id);

+ 3
- 2
src/manager/cn/com/yskj/zfdm/manager/organizationpersonnel/OrganizationPersonnelManagerImpl.java 파일 보기

import cn.com.taiji.common.manager.ManagerException; import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.model.dao.Pagination; import cn.com.taiji.common.model.dao.Pagination;
import cn.com.taiji.common.pub.BeanTools; import cn.com.taiji.common.pub.BeanTools;
import cn.com.yskj.zfdm.entity.User;
import cn.com.yskj.zfdm.entity.dict.OrgLevelType; import cn.com.yskj.zfdm.entity.dict.OrgLevelType;


import cn.com.yskj.zfdm.entity.zfd.OrganizationPersonnel; import cn.com.yskj.zfdm.entity.zfd.OrganizationPersonnel;
* 添加方法 * 添加方法
*/ */
@Override @Override
public void add(@Valid OrganizationPersonnelModel opm) throws ManagerException {
public void add(@Valid OrganizationPersonnelModel opm,User user) throws ManagerException {
// 组织表中的组织编号 // 组织表中的组织编号
if (zoRepo.findByOrgNameId(opm.getOrgName()) != null) { if (zoRepo.findByOrgNameId(opm.getOrgName()) != null) {
String orgId = orgLevel + "_" + id; String orgId = orgLevel + "_" + id;
OrganizationPersonnel op = new OrganizationPersonnel(); OrganizationPersonnel op = new OrganizationPersonnel();
op.setOrgId(orgId); op.setOrgId(orgId);
op.setLoginUserId("admin");
op.setLoginUserId(user.getId());
op.setOrgName(zo.getOrgName()); op.setOrgName(zo.getOrgName());
if(opm.getName()!=null){ if(opm.getName()!=null){
op.setName(opm.getName()); op.setName(opm.getName());

+ 1
- 1
src/manager/cn/com/yskj/zfdm/manager/zfdorg/ZfdOrgManagerImpl.java 파일 보기

org.setOrgSuperiorName(queryModel.getOrgSuperiorName()); org.setOrgSuperiorName(queryModel.getOrgSuperiorName());
zoRepo.save(org); zoRepo.save(org);
}else { }else {
throw new ManagerException("只能添加到三级组织");
throw new ManagerException("最多只能添加到三级组织");
} }
} }
} }

+ 1
- 1
src/web/cn/com/yskj/zfdm/web/organizationpersonnel/OrganizationPersonnelController.java 파일 보기

public String processAdd(@Valid @ModelAttribute("pageModel") OrganizationPersonnelModel opm, HttpServletRequest request, public String processAdd(@Valid @ModelAttribute("pageModel") OrganizationPersonnelModel opm, HttpServletRequest request,
Model model, HttpServletResponse response) throws IOException, ManagerException Model model, HttpServletResponse response) throws IOException, ManagerException
{ {
opManager.add(opm);
opManager.add(opm,LoginHelper.getLoginUser(request));
model.addAttribute("model", opm); model.addAttribute("model", opm);
addSuccess(response, "添加成功!"); addSuccess(response, "添加成功!");
addLog(request, LogType.USER_OPERATE, "用户({})添加测数据成功", LoginHelper.getLoginUser(request).getName()); addLog(request, LogType.USER_OPERATE, "用户({})添加测数据成功", LoginHelper.getLoginUser(request).getName());

+ 4
- 0
src/web/cn/com/yskj/zfdm/web/zfdpatrol/ZfdPatrolController.java 파일 보기

import cn.com.yskj.zfdm.entity.dict.ZfdTaskType; import cn.com.yskj.zfdm.entity.dict.ZfdTaskType;
import cn.com.yskj.zfdm.entity.zfd.ZfdPatrolTask; import cn.com.yskj.zfdm.entity.zfd.ZfdPatrolTask;
import cn.com.yskj.zfdm.manager.LoginHelper; import cn.com.yskj.zfdm.manager.LoginHelper;
import cn.com.yskj.zfdm.manager.vehicle.management.VehicleManagementManger;
import cn.com.yskj.zfdm.manager.zfdpatrol.ZfdPatrolManager; import cn.com.yskj.zfdm.manager.zfdpatrol.ZfdPatrolManager;
import cn.com.yskj.zfdm.model.zfdpatrol.ZfdPatrolModel; import cn.com.yskj.zfdm.model.zfdpatrol.ZfdPatrolModel;
import cn.com.yskj.zfdm.repo.request.zfdpatrol.ZfdPatrolPageRequest; import cn.com.yskj.zfdm.repo.request.zfdpatrol.ZfdPatrolPageRequest;
private static final String prefix = "zfdpatrol/"; private static final String prefix = "zfdpatrol/";
@Autowired @Autowired
private ZfdPatrolManager zpManager; private ZfdPatrolManager zpManager;
@Autowired
private VehicleManagementManger vehicleManager;
/** /**
* *
@RequestMapping(value = "/manage", method = RequestMethod.GET) @RequestMapping(value = "/manage", method = RequestMethod.GET)
public String manageGet(@ModelAttribute("queryModel") ZfdPatrolPageRequest queryModel, Model model) public String manageGet(@ModelAttribute("queryModel") ZfdPatrolPageRequest queryModel, Model model)
{ {
model.addAttribute("vehicles", vehicleManager.findAll());
model.addAttribute("taskTypes",ZfdTaskType.values() ); model.addAttribute("taskTypes",ZfdTaskType.values() );
model.addAttribute("taskStatuses",ZfdTaskStatus.values()); model.addAttribute("taskStatuses",ZfdTaskStatus.values());

+ 12
- 6
war/WEB-INF/jsp/zfdpatrol/manage.jsp 파일 보기

<form:input path="orgName" maxlength="100" <form:input path="orgName" maxlength="100"
cssClass="form-control" placeholder="组织名称" /> cssClass="form-control" placeholder="组织名称" />
</div> </div>
<div class="form-group">
<form:input path="vehicleId" maxlength="100"
cssClass="form-control" placeholder="选择车辆" />
</div>
<tr>
<th>车辆</th>
<td><select name="vehicleId" id="vehicleId"
class="form-control" style="margin: 5px -2px">
<option value="">请选择</option>
<c:forEach items="${vehicles}" var="v">
<option value="${v.vehicleId}">${v.vehiclePalte }_${v.vehiclePlatecolor }</option>
</c:forEach>
</select></td>
</tr>

<div class="form-group"> <div class="form-group">


<div class="col-sm-10"> <div class="col-sm-10">
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<form:label path="zfdTaskType">任务类型</form:label> <form:label path="zfdTaskType">任务类型</form:label>
<form:select path="zfdTaskType" cssClass="form-control" <form:select path="zfdTaskType" cssClass="form-control"

Loading…
취소
저장