[fix]工程管理：物料审核修复

ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java

@@ -66,12 +66,12 @@ public interface BizTodoItemMapper {
     public long getTodoItemTotal(Map<String, Object> paraMap);
     public String getCurrentFlowUser(Map<String, Object> paraMap);
     public String getCurrentNodeName(Map<String, Object> paraMap);
-    public BizTodoItem selectTodoItemByTaskId(@Param(value = "taskId")String taskId,@Param(value = "isHandle")String isHandle);
+    public List<BizTodoItem> selectTodoItemByTaskId(@Param(value = "taskId")String taskId,@Param(value = "isHandle")String isHandle);
     public String selectTodoItemTaskId(@Param(value = "instanceId")String instanceId,@Param(value = "todoUserId")String todoUserId,@Param(value = "isHandle")String isHandle);
     
     public List<BizTodoItem> getTodoItemListNoPaging(Map<String, Object> paraMap);
 
-    @Select("SELECT USER_ID_ FROM ACT_ID_MEMBERSHIP WHERE GROUP_ID_ in (SELECT GROUP_ID_ FROM ACT_RU_IDENTITYLINK WHERE TASK_ID_ = #{taskId})")
+    @Select("SELECT USER_ID_ FROM ACT_ID_MEMBERSHIP WHERE GROUP_ID_ = (SELECT GROUP_ID_ FROM ACT_RU_IDENTITYLINK WHERE TASK_ID_ = #{taskId})")
     List<String> selectTodoUserListByTaskId(@Param(value = "taskId") String taskId);
 
     @Select("SELECT * FROM BIZ_TODO_ITEM WHERE TASK_ID = #{taskId} AND TODO_USER_ID = #{todoUserId}")

ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/IBizTodoItemService.java

@@ -67,7 +67,7 @@ public interface IBizTodoItemService {
     public long getTodoItemTotal(Map<String, Object> paraMap);
     public String getCurrentFlowUser(Map<String, Object> paraMap);
     public String getCurrentNodeName(Map<String, Object> paraMap);
-    public BizTodoItem selectTodoItemByTaskId(String taskId,String isHandle);
+    public List<BizTodoItem> selectTodoItemByTaskId(String taskId, String isHandle);
     public String selectTodoItemTaskId(String instanceId,String todoUserId,String isHandle);
     public List<BizTodoItem> getTodoItemListNoPaging(Map<String, Object> paraMap);
 

ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java

@@ -134,7 +134,7 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService {
 	}
 
 	@Override
-	public BizTodoItem selectTodoItemByTaskId(String taskId,String isHandle) {
+	public List<BizTodoItem> selectTodoItemByTaskId(String taskId, String isHandle) {
 		// TODO Auto-generated method stub
 		return bizTodoItemMapper.selectTodoItemByTaskId(taskId,isHandle);
 	}
@@ -163,9 +163,8 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService {
         List<Task> taskList = taskService.createTaskQuery().processInstanceId(instanceId).active().list();
         int counter = 0;
         for (Task task: taskList) {
-
             // todoitem 去重
-            BizTodoItem bizTodoItem = bizTodoItemMapper.selectTodoItemByTaskId(task.getId(),null);
+            List<BizTodoItem> bizTodoItem = bizTodoItemMapper.selectTodoItemByTaskId(task.getId(),null);
             if (bizTodoItem != null) continue;
 
             BizTodoItem newItem = new BizTodoItem();
@@ -221,7 +220,7 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService {
         for (Task task: taskList) {
 
             // todoitem 去重
-            BizTodoItem bizTodoItem = bizTodoItemMapper.selectTodoItemByTaskId(task.getId(),"0");
+            List<BizTodoItem> bizTodoItem = bizTodoItemMapper.selectTodoItemByTaskId(task.getId(),"0");
             if (bizTodoItem != null) continue;
 
             BizTodoItem newItem = new BizTodoItem();

ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java

@@ -173,6 +173,7 @@ public class ErpMaterialController extends BaseController
                                @ModelAttribute("preloadObj") ErpMaterialVo erpMaterialVo, HttpServletRequest request) {
         boolean saveEntityBoolean = BooleanUtils.toBoolean(saveEntity);
         String instanceId = erpMaterialVo.getInstanceId();
+
         String instanceType = erpMaterialVo.getInstanceType();
         boolean approvedFlag = processService.complete(taskId, instanceId, erpMaterialVo.getApplyTitle(), erpMaterialVo.getMaterialNo(),
                 "material", new HashMap<String, Object>(), request);

ruoyi-admin/src/main/resources/templates/erp/material/add.html

@@ -126,7 +126,7 @@
     <th:block th:include="include :: select2-js" />
     <script th:src="@{/ajax/libs/vue/vue.js}"></script>
     <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
-    <script type="text/javascript">
+    <script th:inline="javascript">
 
         new Vue({
             el: '#app',

ruoyi-admin/src/main/resources/templates/erp/material/detail.html

@@ -148,7 +148,7 @@
     <th:block th:include="include :: select2-js" />
     <script th:src="@{/ajax/libs/vue/vue.js}"></script>
     <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
-    <script type="text/javascript">
+    <script th:inline="javascript">
         new Vue({
             el: '#app',
             data: function() {

ruoyi-admin/src/main/resources/templates/erp/material/edit.html

@@ -131,7 +131,7 @@
     <th:block th:include="include :: select2-js" />
     <script th:src="@{/ajax/libs/vue/vue.js}"></script>
     <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
-    <script type="text/javascript">
+    <script th:inline="javascript">
         new Vue({
             el: '#app',
             data: function() {

ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html

@@ -7,7 +7,7 @@
 </head>
 <body class="white-bg">
 <div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal m" id="form-edit" th:object="${formData}">
+    <form class="form-horizontal m" id="form-gcjl-edit" th:object="${formData}">
         <input name="id" th:field="*{id}" type="hidden">
         <input name="taskId" th:field="*{taskId}" type="hidden">
         <input type="hidden" name="p_COM_comment" />
@@ -271,7 +271,7 @@
     })
 
     var prefix = ctx + "erp/material";
-    $("#form-edit").validate({
+    $("#form-gcjl-edit").validate({
         focusCleanup: true
     });
 
@@ -283,7 +283,7 @@
                 $('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val());
             }
             var taskId = [[${taskId}]];
-            $.operate.save(prefix + "/complete/" + taskId, $('#form-edit').serialize());
+            $.operate.save(prefix + "/complete/" + taskId, $('#form-gcjl-edit').serialize());
         }
     }