浏览代码

1.个贷、大中型新增查询条件

GouGengquan 10 月之前
父节点
当前提交
5807acbe5c

+ 1 - 1
dao/src/main/resources/mapper/AssetsMapper.xml

@@ -190,7 +190,7 @@
             AND assets.department_id = #{assetsSelectDTO.departmentId}
         </if>
         <if test="assetsSelectDTO != null and assetsSelectDTO.getNodeIsBookbindingStamp">
-            AND nodeInfo.currentNodeCode = 'STATEMENT_BOOKBINDING_STAMP' OR nodeInfo.currentNodeCode = 'REPORT_BOOKBINDING_STAMP'
+            AND (nodeInfo.currentNodeCode = 'STATEMENT_BOOKBINDING_STAMP' OR nodeInfo.currentNodeCode = 'REPORT_BOOKBINDING_STAMP')
         </if>
         ORDER BY assets.created DESC
     </select>

+ 6 - 0
dao/src/main/resources/mapper/WorkTaskRecordMapper.xml

@@ -181,6 +181,9 @@
         <if test="todoVO!=null and todoVO.endDate!=null and todoVO.endDate!=''">
             and m.created &lt;= #{todoVO.endDate}
         </if>
+        <if test="todoVO != null and todoVO.getNodeIsBookbindingStamp">
+            AND (wfni.code = 'STATEMENT_BOOKBINDING_STAMP' OR wfni.code = 'REPORT_BOOKBINDING_STAMP' OR wfni.code = 'LETTER_BOOKBINDING_STAMP')
+        </if>
         ORDER BY  wtr.created DESC
     </select>
 
@@ -363,6 +366,9 @@
         <if test="personal!=null and personal.handlerName!=null and personal.handlerName!='' ">
             and u.name like concat('%',#{personal.handlerName},'%')
         </if>
+        <if test="personal != null and personal.getNodeIsBookbindingStamp">
+            AND (wfni.code = 'STATEMENT_BOOKBINDING_STAMP' OR wfni.code = 'REPORT_BOOKBINDING_STAMP' OR wfni.code = 'LETTER_BOOKBINDING_STAMP')
+        </if>
         order by wfni.created DESC
     </select>
 

+ 2 - 0
domain/src/main/java/com/dayou/vo/PersonalTodoVO.java

@@ -84,4 +84,6 @@ public class PersonalTodoVO {
 
     private String comments;
 
+    private Boolean getNodeIsBookbindingStamp;
+
 }

+ 2 - 0
domain/src/main/java/com/dayou/vo/TaskTodoVO.java

@@ -88,4 +88,6 @@ public class TaskTodoVO {
 
     private String cMobile;
 
+    private Boolean getNodeIsBookbindingStamp;
+
 }