代码同步

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java

@@ -241,12 +241,8 @@ public class PlanController extends AbstractBaseController {
     public CommonResponse queryPointById(@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) {
 
         Plan plan = planService.queryPlanById(id);
-        String json=plan!=null? JSON.toJSONString(plan):null;
-        JSONObject obj=json!=null?JSON.parseObject(json):null;
-        if(obj!=null){
-            obj.put("id",obj.get("id").toString());
-        }
-        return CommonResponseUtil.success(obj);
+        Object ob= plan!=null?ToJson.tojson(plan):null;
+        return CommonResponseUtil.success(ob);
 
     }
 

amos-boot-system-patrol/src/main/resources/db/changelog/patrol-sql-task.xml

@@ -474,9 +474,9 @@
 			DROP PROCEDURE IF EXISTS `updatePlanTask`;
 		</createProcedure>
 	</changeSet>
-	<changeSet author="gaodongdong" id="1610421278000-21" runAlways="true">
+	<changeSet author="gaodongdong" id="1610421278000-21-230419" runAlways="true">
 		<createProcedure procedureName="updatePlanTask" >
-			CREATE PROCEDURE `updatePlanTask`(IN `planTaskId` int,IN `pointId` int,IN `planTaskDetailId` int,IN `executorId` int)
+			CREATE PROCEDURE `updatePlanTask`(IN `planTaskId` BIGINT,IN `pointId` BIGINT,IN `planTaskDetailId` BIGINT,IN `executorId` BIGINT)
 			BEGIN
 			declare num int ;
 			declare orgCode VARCHAR(50) ;