周期性巡查任务代码修改

src/dao/cn/com/yskj/zfdm/repo/request/zfdpatrol/ZfdPatrolPageRequest.java

@@ -6,7 +6,6 @@ import cn.com.taiji.common.pub.dao.HqlBuilder;
 import cn.com.taiji.common.repo.request.jpa.JpaPageableDataRequest;
 import cn.com.yskj.zfdm.entity.dict.ZfdTaskStatus;
 import cn.com.yskj.zfdm.entity.dict.ZfdTaskType;
-import cn.com.yskj.zfdm.entity.dict.zfdWeekDateType;
 import cn.com.yskj.zfdm.entity.zfd.ZfdPatrolTask;
 
 /**

src/manager/cn/com/yskj/zfdm/manager/ZfdRecurringPatrolPlanManagerImpl.java

@@ -69,7 +69,6 @@ public class ZfdRecurringPatrolPlanManagerImpl extends AbstractManager implement
 	//添加每日巡查任务
 	@Override
 	public void add(@Valid ZfdRecurringPatrolPlanModel zrppm) throws ManagerException {
-		System.out.println(zrppm);
 		zrppm.valid();
 		ZfdRecurringPatrolPlan zrpp = new ZfdRecurringPatrolPlan();
 		//通过车牌号查询
@@ -162,7 +161,6 @@ public class ZfdRecurringPatrolPlanManagerImpl extends AbstractManager implement
 	@Override
 	public void update(@Valid ZfdRecurringPatrolPlan zrpp) {
 		ZfdRecurringPatrolPlan zfdRecurringPatrolPlan = zrppRepo.findById(zrpp.getId()).get();
-		
 		BeanTools.copyProperties(zrpp, zfdRecurringPatrolPlan,new String[] { "id", "insertTime", "cronPattern", "cronPatternZh","taskDate" });
 		OrganizationPersonnel op = opRepo.findByName(zfdRecurringPatrolPlan.getMemberName());
 		String oid = op.getId();
@@ -195,7 +193,7 @@ public class ZfdRecurringPatrolPlanManagerImpl extends AbstractManager implement
 		// 循环遍历
 		for (ZfdRecurringPatrolPlan zfdRecurringPatrolPlan : zfdRecurringPatrolPlanList) {
 			ZfdPatrolTask zfd =new ZfdPatrolTask();
-			zfd.setInsertTime(LocalDateTime.now());
+			zfd.setInsertTime(zfdRecurringPatrolPlan.getInsertTime());
 			zfd.setUpdateTime(LocalDateTime.now());
 			zfd.setPlanName(zfdRecurringPatrolPlan.getPlanName());
 			zfd.setMemberId(zfdRecurringPatrolPlan.getMemberId());
@@ -228,7 +226,7 @@ public class ZfdRecurringPatrolPlanManagerImpl extends AbstractManager implement
 		// 循环遍历
 		for (ZfdRecurringPatrolPlan zfdRecurringPatrolPlan : zfdRecurringPatrolPlanList) {
 			ZfdPatrolTask zfd =new ZfdPatrolTask();
-			zfd.setInsertTime(LocalDateTime.now());
+			zfd.setInsertTime(zfdRecurringPatrolPlan.getInsertTime());
 			zfd.setUpdateTime(LocalDateTime.now());
 			zfd.setPlanName(zfdRecurringPatrolPlan.getPlanName());
 			zfd.setMemberId(zfdRecurringPatrolPlan.getMemberId());
@@ -257,7 +255,7 @@ public class ZfdRecurringPatrolPlanManagerImpl extends AbstractManager implement
 		// 循环遍历
 		for (ZfdRecurringPatrolPlan zfdRecurringPatrolPlan : zfdRecurringPatrolPlanList) {
 			ZfdPatrolTask zfd =new ZfdPatrolTask();
-			zfd.setInsertTime(LocalDateTime.now());
+			zfd.setInsertTime(zfdRecurringPatrolPlan.getInsertTime());
 			zfd.setUpdateTime(LocalDateTime.now());
 			zfd.setPlanName(zfdRecurringPatrolPlan.getPlanName());
 			zfd.setMemberId(zfdRecurringPatrolPlan.getMemberId());

src/web/cn/com/yskj/zfdm/web/ZfdAuditorController.java

@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.HttpMimeResponseHelper;
@@ -114,23 +112,23 @@ public class ZfdAuditorController extends BaseLogController {
 	 * @return
 	 */
 	@RequestMapping(value = "/edit/{id}", method = RequestMethod.GET)
-	public String setupEdit(@PathVariable("id") String id, Model model)
-	{
-		
-		ZfdAuditor test =  zfdAuditorManager.findById(id);
-		model.addAttribute("pageModel", test);
-		return prefix + "edit";
-	}
-	@RequestMapping(value = "/edit", method = RequestMethod.POST)
-	public String processEdit(@Valid @ModelAttribute("pageModel")  ZfdAuditor opm, Model model,HttpServletRequest request,
-			HttpServletResponse response) throws IOException, ManagerException
-	{
-		zfdAuditorManager.update(opm);
-		model.addAttribute("model", opm);
-		addSuccess(response, "修改成功!");
-		addLog(request, LogType.USER_OPERATE, "用户（{}）修改数据{}成功", LoginHelper.getLoginUser(request).getName(),opm.getId());
-		return prefix + "result";
-	}
+	 public String setupEdit(@PathVariable("id") String id, Model model)
+	 {
+	  
+	  ZfdAuditor test =  zfdAuditorManager.findById(id);
+	  model.addAttribute("pageModel", test);
+	  return prefix + "edit";
+	 }
+	 @RequestMapping(value = "/edit", method = RequestMethod.POST)
+	 public String processEdit(@Valid @ModelAttribute("pageModel")  ZfdAuditor opm, Model model,HttpServletRequest request,
+	   HttpServletResponse response) throws IOException, ManagerException
+	 {
+	  zfdAuditorManager.update(opm);
+	  model.addAttribute("model", opm);
+	  addSuccess(response, "修改成功!");
+	  addLog(request, LogType.USER_OPERATE, "用户（{}）修改数据{}成功", LoginHelper.getLoginUser(request).getName(),opm.getId());
+	  return prefix + "result";
+	 }
 
 
 	
@@ -166,12 +164,6 @@ public class ZfdAuditorController extends BaseLogController {
 	}
 	
 	
-	@RequestMapping(value = "/apiTest", method = RequestMethod.POST)
-	@ResponseBody
-	public String apiTest(@RequestParam("name") String name)
-	{
-		String code = zfdAuditorManager.apiTest(name);
-		return code;
-	}
+
 	
 }

war/WEB-INF/jsp/ZfdRecurringPatrolPlan/view.jsp

@@ -27,7 +27,12 @@
 			<th>巡查计划名称</th>
 			<td>${pageModel.planName }</td>
 		</tr>
-		
+		<tr>
+			<th>添加时间</th>
+			<td >
+			<javatime:format value="${pageModel.insertTime}" pattern="yyyy-MM-dd HH:mm:ss"  />
+			</td>
+		</tr>
 		<tr>
 			<th>所属组织名称</th>
 			<td>${pageModel.orgName }</td>

war/WEB-INF/jsp/zfdpatrol/view.jsp

@@ -31,6 +31,12 @@
 			<th>所属组织</th>
 			<td>${pageModel.orgName }</td>
 		</tr>
+		<tr>
+			<th>添加时间</th>
+			<td >
+			<javatime:format value="${pageModel.insertTime}" pattern="yyyy-MM-dd HH:mm:ss"  />
+			</td>
+		</tr>
 		<tr>
 			<th>指定人员</th>
 			<td>${pageModel.memberName }</td>
@@ -48,10 +54,19 @@
 			<th>任务类型</th>
 			<td>${pageModel.zfdTaskType.value }</td>
 		</tr>
+		<tr>
+			<th>每周任务日期</th>
+			<td>${pageModel.day.value }</td>
+		</tr>
+		<tr>
+			<th>每月任务日期</th>
+			<td>${pageModel.number.value }</td>
+		</tr>
 		<tr>
 			<th>任务状态</th>
 			<td>${pageModel.zfdTaskStatus.value }</td>
 		</tr>
+		
 	</table>
 </div>
 <div class="modal-footer">