同步问题修改

冲突处理

src/main/java/aiyh/utils/response_deal/state/UpdateState.java

@@ -52,7 +52,7 @@ public class UpdateState extends State {
                 definition.getRowDefinitionCallback().rowHandle(definition);
             }
             updateList.add(definition.getUpdateParam());
-            updateList.add(definition.getWhereParam());
+            whereList.add(definition.getWhereParam());
         }
         RowDefinition rowDefinition = rowDefinitionList.get(0);
         String updateSql = MapperBuilderSql.builderUpdateSql(assignTable, rowDefinition.getUpdateParam(),"upItem");

src/main/java/com/api/bokang/xiao/sh_bigdata/mapper/ReportMapper.java

@@ -77,7 +77,7 @@ public interface ReportMapper {
     @Select("select hrm.lastname " +
             " from uf_jsyzbap_dt1 jsy " +
             " inner join hrmresource hrm on jsy.$t{field} = hrm.id" +
-            " where jsy.zblx = #{dutyType} and #{currentDate} >= jsy.zbksrq and #{currentDate} <= jsy.zbjsrq }")
+            " where #{currentDate} >= jsy.zbksrq and #{currentDate} <= jsy.zbjsrq }")
     @CaseConversion(value = false)
     List<String> queryCarSchedule(Map<String,Object> param);