修改废证查询出错

src/main/java/com/yxproject/start/api/FailedCardApi.java

@@ -90,11 +90,9 @@ public class FailedCardApi {
     /**
      * 查询提交人上传的废证详情
      *
-     * @param date      提交日期
      * @param name      提交人姓名
      * @param startDate 提交起始日期
      * @param endDate   提交结束日期
-     * @param requ
      * @return
      */
     @RequestMapping("queryFailedCardInfo")

src/main/java/com/yxproject/start/mapper/FailedCardMapper.java

@@ -157,14 +157,19 @@ public interface FailedCardMapper {
      * @param name 提交人姓名
      * @return
      */
-    @Select("select failed_card.FAILED_CARD_ID,FAILED_CARD_REASON_DIC.FAILED_CARD_REASON FAILED_CARD_REASON_ID,\n" +
+    @Select("<script> select failed_card.FAILED_CARD_ID,FAILED_CARD_REASON_DIC.FAILED_CARD_REASON FAILED_CARD_REASON_ID,\n" +
             "failed_card.ACCEPT_NO,failed_card.TASK_ID,failed_card.POSITION_DATE,failed_card.FINISH_DATE,\n" +
             "failed_card.ALLOT_DATE,failed_card.PRINT_DATE,decode(STATE,0,'已提交',1,'打印',2,'预封装',4,'工作组',5,'分拣') STATE,failed_card.INITIATOR,failed_card.NOTE,\n" +
             "failed_card.WORK_GROUP,failed_card.NAME,failed_card.SUBMIT_DATE,prod_card_t.id_no,prod_card_t.name card_name\n" +
             "from failed_card  " +
             "left join PROD_CARD_T@prodyd_link on failed_card.ACCEPT_NO = prod_card_t.ACCEPT_NO\n" +
             "left join FAILED_CARD_REASON_DIC on failed_card.FAILED_CARD_REASON_ID = FAILED_CARD_REASON_DIC.FAILED_CARD_REASON_ID " +
-            "where failed_card.name = #{name} and to_char(submit_date,'yyyyMMdd') between #{startDate} and #{endDate} order by failed_card.ACCEPT_NO")
+            "where 1=1 " +
+            "<if test = 'name != null'> " +
+            " and failed_card.name = #{name}" +
+            " </if>" +
+            " and to_char(submit_date,'yyyyMMdd') between #{startDate} and #{endDate} order by failed_card.ACCEPT_NO" +
+            "</script>")
     public List<Map<String, Object>> selectFailedCardInfo(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("name") String name);
 
 

src/main/java/com/yxproject/start/mapper/TaskListMapper.java

@@ -209,16 +209,16 @@ public interface TaskListMapper {
             "<if test = 'workGroup != null'> " +
             ",work_Group" +
             " </if>" +
-            "<if test = 'note != null'> " +
-            ",note" +
-            " </if>" +
+//            "<if test = 'note != null'> " +
+//            ",note" +
+//            " </if>" +
             ") values(#{cardType},#{countyCode},#{submitName},#{taskStateId}" +
             "<if test = 'workGroup != null'> " +
             ",#{workGroup}" +
             " </if>" +
-            "<if test = 'note != null'> " +
-            ",#{note}" +
-            " </if>" +
+//            "<if test = 'note != null'> " +
+//            ",#{note}" +
+//            " </if>" +
             ") " +
             "</script>")
     @Options(useGeneratedKeys=true, keyProperty="taskId", keyColumn="TASK_ID")