代码提交

bonus-admin/src/main/java/com/bonus/web/domain/TransferProblemDto.java

@@ -22,6 +22,10 @@ public class TransferProblemDto {
      * 项目名称
      */
     private String proName;
+    /**
+     * 工程类型
+     */
+    private String proType;
 
     /**
      * 单项工程名称

bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml

@@ -355,7 +355,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		LEFT JOIN da_ky_sys_dept d ON dkta.dept_id = d.dept_id AND d.del_flag = '0'
 		where dkta.del_flag = '1'
 		<if test="proName != null and proName != ''">
-			AND INSTR(dkta.single_pro_name, #{proName}) > 0
+			AND INSTR(dkta.pro_name, #{proName}) > 0
+		</if>
+		<if test="singleProName != null and singleProName != ''">
+			AND INSTR(dkta.single_pro_name, #{singleProName}) > 0
 		</if>
 		<if test="transfertTime != null and transfertTime != ''">
 			and DATE(dkta.transfer_time) = #{transfertTime}