Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -309,7 +309,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		if (calenders == null || calenders.size() == 0) {
 			params.put("paymentcalender", "一次性");
 		} else {
-			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")));
+			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")) + "月");
 		}
 
 		params.put("isShowVisualSeal", false);
@@ -399,7 +399,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		if (calenders == null || calenders.size() == 0) {
 			params.put("paymentcalender", "一次性");
 		} else {
-			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")));
+			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")) + "月");
 		}
 
 		params.put("isShowVisualSeal", true);

mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -155,10 +155,10 @@
             <if test="signOutStatus != null and signOutStatus != 3">
                 AND ta.sign_out_status_ = #{signOutStatus}
             </if>
-            <if test="signOutStatus != null and signOutStatus = 3">
+            <if test="signOutStatus != null and signOutStatus == 3">
                 AND ta.sign_out_status_ IS NULL
             </if>
-            <if test="signInStatus != null and signInStatus = 3">
+            <if test="signInStatus != null and signInStatus == 3">
                 AND ta.sign_in_status_ IS NULL
             </if>
             <if test="courseScheduleType != null">

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -512,10 +512,10 @@
             <if test="signOutStatus != null and signOutStatus != 3">
                 AND ta.sign_out_status_ = #{signOutStatus}
             </if>
-            <if test="signOutStatus != null and signOutStatus = 3">
+            <if test="signOutStatus != null and signOutStatus == 3">
                 AND ta.sign_out_status_ IS NULL
             </if>
-            <if test="signInStatus != null and signInStatus = 3">
+            <if test="signInStatus != null and signInStatus == 3">
                 AND ta.sign_in_status_ IS NULL
             </if>
         </where>