修改

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

@@ -2474,6 +2474,7 @@ public class SjDjjcController extends BaseController {
         }
         }
 
 
         Dcmbgl dcmbgl = dcmbglService.selectDcmbglById(dcmmbglid);
         Dcmbgl dcmbgl = dcmbglService.selectDcmbglById(dcmmbglid);
+        sjDjjc.setFalx(dcmbgl.getType());
         String filePath = dcmbgl.getFilePath();
         String filePath = dcmbgl.getFilePath();
         filePath = filePath.replace("/profile/upload", "");
         filePath = filePath.replace("/profile/upload", "");
         String path = RuoYiConfig.getUploadPath() + filePath;
         String path = RuoYiConfig.getUploadPath() + filePath;
@@ -2594,9 +2595,37 @@ public class SjDjjcController extends BaseController {
         }
         }
     }
     }
 
 
+    @Autowired
+    private BizTodoItemMapper bizTodoItemMapper;
     public Map<String, Object> buildDataModel(SjDjjc sjDjjc) {
     public Map<String, Object> buildDataModel(SjDjjc sjDjjc) {
         Map<String, Object> dataModel = new HashMap<>();
         Map<String, Object> dataModel = new HashMap<>();
         String jh = sjDjjc.getJh();
         String jh = sjDjjc.getJh();
+        if(StringUtils.isNotEmpty(sjDjjc.getFalx())){
+            //查询审批意见
+            String instanceId = sjDjjc.getInstanceId();
+            if(sjDjjc.getFalx().equals("钻井液方案")){
+                instanceId=sjDjjc.getZjyinstanceId();
+            }
+            if(StringUtils.isNotEmpty(instanceId)){
+                //查询审批意见
+                List<BizTodoItem> bizTodoItemList=bizTodoItemMapper.selectBizTodoItemSpList(instanceId);
+                List<Map<String,Object>> spList=new ArrayList<>();
+                for(BizTodoItem bizTodoItem:bizTodoItemList){
+                    Map<String,Object> mapSp=new HashMap<>();
+                    mapSp.put("spr","审批人："+bizTodoItem.getHandleUserName());
+                    mapSp.put("spyj","审批意见："+bizTodoItem.getComment());
+                    spList.add(mapSp);
+                }
+                dataModel.put("spList", spList);
+            }else {
+                dataModel.put("spList", new ArrayList<>());
+            }
+        }else {
+            dataModel.put("spList", new ArrayList<>());
+        }
+
+
+
         // 添加基础信息
         // 添加基础信息
         dataModel.put("jh", jh);
         dataModel.put("jh", jh);
         dataModel.put("jb", sjDjjc.getJb());
         dataModel.put("jb", sjDjjc.getJb());

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

@@ -263,6 +263,9 @@ public class SjDjjc extends ProcessBaseEntity
     //撤回类型
     //撤回类型
     private String chtype;
     private String chtype;
 
 
+    //方案类型
+    private String falx;
+
 
 
 
 
 
 

src/main/java/com/zjsgfa/project/zjsgfa/mapper/BizTodoItemMapper.java

@@ -70,4 +70,7 @@ public interface BizTodoItemMapper
 
 
 
 
     List<BizTodoItem> selectBizTodoItemListbyinstanceId(BizTodoItem bizTodoItem);
     List<BizTodoItem> selectBizTodoItemListbyinstanceId(BizTodoItem bizTodoItem);
+
+    List<BizTodoItem> selectBizTodoItemSpList(String instanceId);
+
 }
 }

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

@@ -103,6 +103,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             todo_user_id, todo_user_name, handle_user_id, handle_user_name, todo_time, handle_time from biz_todo_item
             todo_user_id, todo_user_name, handle_user_id, handle_user_name, todo_time, handle_time from biz_todo_item
         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 * 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>
 
 
     <insert id="insertBizTodoItem" parameterType="BizTodoItem" useGeneratedKeys="true" keyProperty="id">
     <insert id="insertBizTodoItem" parameterType="BizTodoItem" useGeneratedKeys="true" keyProperty="id">
         insert into biz_todo_item
         insert into biz_todo_item