MMF 2026-03-18 施工方案、钻井液方案导出增加电子签名

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java

@@ -2613,7 +2613,12 @@ public class SjDjjcController extends BaseController {
                 List<Map<String,Object>> spList=new ArrayList<>();
                 List<Map<String,Object>> spList=new ArrayList<>();
                 for(BizTodoItem bizTodoItem:bizTodoItemList){
                 for(BizTodoItem bizTodoItem:bizTodoItemList){
                     Map<String,Object> mapSp=new HashMap<>();
                     Map<String,Object> mapSp=new HashMap<>();
-                    mapSp.put("spr",bizTodoItem.getHandleUserName());
+                    if (StringUtils.isNotEmpty(bizTodoItem.getDzqm())) {
+                        Map<String, PictureRenderData> pictureMap = createPictureMap(bizTodoItem.getDzqm(), 120, 40);
+                        mapSp.put("spr", pictureMap.get("jwt"));
+                    } else {
+                        mapSp.put("spr", null);
+                    }
                     mapSp.put("spyj",bizTodoItem.getComment());
                     mapSp.put("spyj",bizTodoItem.getComment());
                     spList.add(mapSp);
                     spList.add(mapSp);
                 }
                 }

src/main/java/com/zjsgfa/project/zjsgfa/domain/BizTodoItem.java

@@ -92,4 +92,9 @@ public class BizTodoItem extends BaseEntity
     //当前任务名称
     //当前任务名称
     private String dqtaskName;
     private String dqtaskName;
 
 
+    /**
+     * 审批人电子签名
+     */
+    private String dzqm;
+
 }
 }

src/main/resources/mybatis/zjsgfa/BizTodoItemMapper.xml

@@ -104,10 +104,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where instance_id=#{instanceId} and task_name =(select task_name from biz_todo_item where task_id =#{taskId})
         where instance_id=#{instanceId} and task_name =(select task_name from biz_todo_item where task_id =#{taskId})
     </select>
     </select>
     <select id="selectBizTodoItemSpList" resultType="com.zjsgfa.project.zjsgfa.domain.BizTodoItem">
     <select id="selectBizTodoItemSpList" resultType="com.zjsgfa.project.zjsgfa.domain.BizTodoItem">
-
-        select * from biz_todo_item where instance_id=#{instanceId}  and  id>(
-            select max(id) from biz_todo_item where instance_id=#{instanceId} and task_name='taskTb')
-                                      and is_handle='1'
+        SELECT
+            biz.*, user.dzqm
+        FROM
+            biz_todo_item biz
+            LEFT JOIN sys_user user ON biz.handle_user_id=user.user_name
+        WHERE
+            biz.instance_id = #{instanceId}
+            AND biz.id > ( SELECT max( id ) FROM biz_todo_item WHERE instance_id = #{instanceId} AND task_name = 'taskTb' )
+            AND biz.is_handle = '1'
     </select>
     </select>
 
 
     <insert id="insertBizTodoItem" parameterType="BizTodoItem" useGeneratedKeys="true" keyProperty="id">
     <insert id="insertBizTodoItem" parameterType="BizTodoItem" useGeneratedKeys="true" keyProperty="id">