Commit 402c306a authored by Administrator's avatar Administrator

CountyList查询方式修改为只通过taskId

parent b9ed059a
...@@ -129,16 +129,19 @@ public class UserApi { ...@@ -129,16 +129,19 @@ public class UserApi {
* *
* @return * @return
*/ */
@RequestMapping(value = "/updateProductionTask", method = RequestMethod.GET) @RequestMapping(value = "/updateTaskState", method = RequestMethod.GET)
@RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@ResponseBody @ResponseBody
public String updateProductionTask(@RequestParam("id") String id, HttpServletResponse resp) { public String updateProductionTask(@RequestParam("taskId") Long id,@RequestParam("state") int state, HttpServletResponse resp) {
String map = "{\"production_Task_List_Id\":\"20181016001\",\"make_Type\":8,\"old_Make_Type\":8,} "; // String map = "{\"production_Task_List_Id\":\"20181016001\",\"make_Type\":8,\"old_Make_Type\":8,} ";
JSONObject jsonObject = JSONObject.fromObject(map); // JSONObject jsonObject = JSONObject.fromObject(map);
TaskEntity productionTaskListEntity = (TaskEntity) JSONObject.toBean(jsonObject, TaskEntity.class); // TaskEntity productionTaskListEntity = (TaskEntity) JSONObject.toBean(jsonObject, TaskEntity.class);
TaskEntity taskEntity = new TaskEntity();
taskEntity.setTask_Id(id);
taskEntity.setTask_State_Id(state);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = taskService.updateProductionTask(productionTaskListEntity); int i = taskService.updateProductionTask(taskEntity);
yxjsonResponse.outPutSuccess(i + "更新成功"); yxjsonResponse.outPutSuccess(i + "更新成功");
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -351,8 +354,8 @@ public class UserApi { ...@@ -351,8 +354,8 @@ public class UserApi {
*/ */
@RequestMapping("getCountyList") @RequestMapping("getCountyList")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String getCountyListInfoByTaskId(@RequestParam("taskId") String taskId,@RequestParam("taskStateId") String taskStateId,@RequestParam("cardType") String cardType, HttpServletResponse resp) { public String getCountyListInfoByTaskId(@RequestParam("taskId") String taskId, HttpServletResponse resp) {
List<CountyEntity> countyListEntity = countyService.findCountyList(taskId,taskStateId,cardType); List<CountyEntity> countyListEntity = countyService.findCountyList(taskId);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(countyListEntity); yxjsonResponse.outPutSuccess(countyListEntity);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment