Merge remote-tracking branch 'origin/V1' into V1

common/src/main/java/com/jpsoft/smart/modules/base/entity/AlarmConfig.java

@@ -43,6 +43,14 @@ public class AlarmConfig {
      */
     @ApiModelProperty(value = "几时几分结束")
     private String endTime;
+
+    /**
+     * 考勤时间
+     */
+    @ApiModelProperty(value = "考勤时间")
+    private String attendanceTime;
+
+
     /**
      * 是否删除
      */

common/src/main/java/com/jpsoft/smart/modules/base/entity/PersonInfo.java

@@ -147,6 +147,9 @@ public class PersonInfo {
 
     private Boolean isNormal;
 
-    @ApiModelProperty(value="子公司ID")
+    @ApiModelProperty(value="关联单位")
     private String personCompany;
+
+    @ApiModelProperty(value="是否接收微信通知")
+    private Boolean wechatNoticeEnabled;
 }

common/src/main/resources/mapper/base/AlarmConfig.xml

@@ -10,6 +10,7 @@
         <result property="weekdays" column="weekdays_"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
+        <result property="attendanceTime" column="attendance_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -24,7 +25,7 @@
         -->
         <![CDATA[
 		insert into base_alarm_config
-	    (id_,company_id,weekdays_,start_time,end_time,del_flag,create_by,create_time,update_by,update_time)
+	    (id_,company_id,weekdays_,start_time,end_time,del_flag,create_by,create_time,update_by,update_time,attendance_time)
 		values
 		(
             #{id,jdbcType=VARCHAR}
@@ -37,6 +38,7 @@
             ,#{createTime,jdbcType= TIMESTAMP }
             ,#{updateBy,jdbcType=VARCHAR}
             ,#{updateTime,jdbcType= TIMESTAMP }
+            ,#{attendanceTime,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -76,6 +78,9 @@
             <if test="updateTime!=null">
                 update_time=#{updateTime,jdbcType= TIMESTAMP },
             </if>
+            <if test="attendanceTime!=null">
+                attendance_time=#{attendanceTime,jdbcType= TIMESTAMP },
+            </if>
         </set>
         where id_=#{id}
     </update>

common/src/main/resources/mapper/base/PersonInfo.xml

@@ -29,6 +29,8 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="popedom" column="popedom_"/>
+        <result property="wechatNoticeEnabled" column="wechat_notice_enabled"/>
+
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.PersonInfo">
         <!--
@@ -41,7 +43,7 @@
 	    (company_id,name_,phone_,id_card,open_id,face_enabled,face_bound,card_enabled,
 	    app_enabled,password_enabled,guest_enabled,position1_,position2_,
 	    position3_,position4_,position5_,face_image_url,del_flag,
-	    create_by,create_time,update_by,update_time,popedom_)
+	    create_by,create_time,update_by,update_time,popedom_,wechat_notice_enabled)
 		values
 		(
             #{companyId,jdbcType=VARCHAR}
@@ -67,6 +69,7 @@
             ,#{updateBy,jdbcType=VARCHAR}
             ,#{updateTime,jdbcType= TIMESTAMP }
             ,#{popedom,jdbcType= VARCHAR }
+            ,#{wechatNoticeEnabled,jdbcType= NUMERIC }
 		)
 	]]>
     </insert>
@@ -145,6 +148,9 @@
             <if test="popedom!=null">
                 popedom_=#{popedom,jdbcType= VARCHAR },
             </if>
+            <if test="wechatNoticeEnabled!=null">
+                wechat_notice_enabled=#{wechatNoticeEnabled,jdbcType= NUMERIC },
+            </if>
         </set>
         where id_=#{id}
     </update>