p_plan_task_detail表添加 执行人冗余字段，用于巡查统计页面展示

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskDetailMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 public interface PlanTaskDetailMapper extends BaseMapper {
 	void finishTaskDetail(@Param(value="planTaskDetailId") long planTaskDetailId, @Param(value="pointId") long pointId, @Param(value="planTaskId") long planTaskId
-						, @Param(value="executorId") String executorId);
+						, @Param(value="executorId") String executorId, @Param(value="executorName") String executorName);
 
 	Map findPlanTaskByTaskIdAndPointId(@Param(value="planTaskId") long planTaskId,@Param(value="pointId") long pointId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -414,7 +414,7 @@ public class CheckServiceImpl implements ICheckService {
                 checkService.saveCheckImg(imgList);
             }
             if (check.getPlanTaskId() > 0) {
-                planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), requestParam.getPointId(), requestParam.getPlanTaskId(), user.getUserId());
+                planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), requestParam.getPointId(), requestParam.getPlanTaskId(), user.getUserId(), user.getRealName());
             } else {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                 planTaskMapper.reformStatistics(user.getUserId(), sdf.format(new Date()), requestParam.getOrgCode());
@@ -649,7 +649,7 @@ public class CheckServiceImpl implements ICheckService {
                 checkService.saveCheckImg(imgList);
             }
             if (check.getPlanTaskId() > 0) {
-                planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), requestParam.getPointId(), requestParam.getPlanTaskId(), requestParam.getUserId());
+                planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), requestParam.getPointId(), requestParam.getPlanTaskId(), requestParam.getUserId(), requestParam.getUserName());
             } else {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                 planTaskMapper.reformStatistics(requestParam.getUserId(), sdf.format(new Date()), requestParam.getOrgCode());

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

@@ -95,4 +95,16 @@
             ADD INDEX `idx_is_ok` (`is_ok`) USING BTREE;
         </sql>
     </changeSet>
+
+    <changeSet author="zs" id="20240318-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <indexExists tableName="p_plan_task_detail" indexName="executor_name" />
+            </not>
+        </preConditions>
+        <sql>
+            ALTER TABLE `p_plan_task_detail`
+            ADD COLUMN `executor_name` varchar(255) NULL COMMENT '执行人名称';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-patrol/src/main/resources/db/mapper/plan_task_detail.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskDetailMapper">
 	<update id="finishTaskDetail">
-		call updatePlanTask(#{planTaskId}, #{pointId}, #{planTaskDetailId} ,#{executorId})
+		call updatePlanTask(#{planTaskId}, #{pointId}, #{planTaskDetailId} ,#{executorId}, #{executorName})
 	</update>
 	
 	<select id="findPlanTaskByTaskIdAndPointId" resultType="Map">