Merge remote-tracking branch 'origin/master'

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/enums/TeacherSettlementTypeEnum.java

@@ -9,7 +9,7 @@ import com.keao.edu.common.enums.BaseEnum;
 public enum TeacherSettlementTypeEnum implements BaseEnum<String, TeacherSettlementTypeEnum> {
 
     SINGLE("SINGLE", "单次结算"),
-    PEOPLE_NUM("PEOPLE_NUM", "人数"),
+    PEOPLE_NUM("PEOPLE_NUM", "人数结算"),
     SUBSIDY_NUM("SUBSIDY_NUM", "组合(补贴+人数)");
 
     private String code;

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/TeacherServiceImpl.java

@@ -232,12 +232,17 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
                         }
 
                         if (column.getValue().equals("salarySettlementType")) {
+                            boolean has = false;
                             for (TeacherSettlementTypeEnum settlementType : TeacherSettlementTypeEnum.values()) {
                                 if (settlementType.getMsg().equals(row.get(s).toString())) {
                                     objectMap.put("salarySettlementType", settlementType);
+                                    has = true;
                                     break;
                                 }
                             }
+                            if (!has) {
+                                throw new BizException(row.get(s).toString() + "方式不存在，请核查");
+                            }
                         }
                     }
                 }

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamManualLedgerMapper.xml

@@ -116,10 +116,10 @@
 				AND eml.target_organ_id_ IS NULL
 			</if>
 			<if test="startTime != null">
-				AND eml.trans_time_ &gt;= #{startTime}
+				AND date(eml.trans_time_) &gt;= #{startTime}
 			</if>
 			<if test="endTime != null">
-				AND eml.trans_time_ &lt;= #{endTime}
+				AND date(eml.trans_time_) &lt;= #{endTime}
 			</if>
 			<if test="search != null">
 				AND (eml.id_ like concat('%',#{search},'%') or su.real_name_ like concat('%',#{search},'%'))