线上bug修改

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysLogininfor.java

@@ -23,6 +23,18 @@ public class SysLogininfor extends BaseEntity
     @Excel(name = "用户账号")
     private String userName;
 
+    /** 用户昵称 */
+    @Excel(name = "用户昵称")
+    private String nickName;
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
     /** 状态 0成功 1失败 */
     @Excel(name = "状态", readConverterExp = "0=成功,1=失败")
     private String status;

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysOperLog.java

@@ -46,6 +46,10 @@ public class SysOperLog extends BaseEntity
     @Excel(name = "操作人员")
     private String operName;
 
+    /** 用户昵称 */
+    @Excel(name = "用户昵称")
+    private String nickName;
+
     /** 部门名称 */
     @Excel(name = "部门名称")
     private String deptName;
@@ -112,7 +116,13 @@ public class SysOperLog extends BaseEntity
     {
         this.businessType = businessType;
     }
+    public String getNickName() {
+        return nickName;
+    }
 
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
     public Integer[] getBusinessTypes()
     {
         return businessTypes;

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java

@@ -91,4 +91,8 @@ public class AgreementInfo extends BaseEntity {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    /** 协议类型 */
+    @Excel(name = "协议类型")
+    @ApiModelProperty(value = "协议类型(1内部单位  2外部单位)")
+    private Integer protocol;
 }

sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="protocol" column="protocol"/>
         <result property="companyId" column="company_id"/>
         <result property="fileName" column="file_name"/>
         <result property="fileUrl" column="file_url"/>
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="authPerson != null">auth_person,</if>
             <if test="phone != null">phone,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="protocol != null">protocol,</if>
             update_time,
             <if test="remark != null">remark,</if>
             <if test="companyId != null">company_id,</if>
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="authPerson != null">#{authPerson},</if>
             <if test="phone != null">#{phone},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="protocol != null">#{protocol},</if>
             NOW(),
             <if test="remark != null">#{remark},</if>
             <if test="companyId != null">#{companyId},</if>
@@ -85,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="protocol != null">protocol = #{protocol},</if>
             <if test="companyId != null">company_id = #{companyId},</if>
             <if test="fileName != null">file_name = #{fileName},</if>
             <if test="fileUrl != null">file_url = #{fileUrl},</if>
@@ -99,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getAgreementInfoAll" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
         SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time,
                bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName,
-               plan_start_time,lease_day,auth_person,phone,bai.remark
+               plan_start_time,lease_day,auth_person,phone,bai.remark,bai.protocol
         FROM bm_agreement_info bai
          LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id
          LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/SysNotice.java

@@ -28,6 +28,17 @@ public class SysNotice extends BaseEntity
     /** 公告内容 */
     private String noticeContent;
 
+    /** 用户昵称 */
+    private String nickName;
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
     /** 公告状态（0正常 1关闭） */
     private String status;
 

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<resultMap type="com.bonus.sgzb.system.api.domain.SysLogininfor" id="SysLogininforResult">
 		<id     property="infoId"        column="info_id"           />
 		<result property="userName"      column="user_name"         />
+		<result property="nickName"      column="nick_name"         />
 		<result property="status"        column="status"            />
 		<result property="ipaddr"        column="ipaddr"            />
 		<result property="msg"           column="msg"               />

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="noticeContent"  column="notice_content"  />
         <result property="status"         column="status"          />
         <result property="createBy"       column="create_by"       />
+        <result property="nickName"       column="nick_name"       />
         <result property="createTime"     column="create_time"     />
         <result property="updateBy"       column="update_by"       />
         <result property="updateTime"     column="update_time"     />
@@ -28,16 +29,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectNoticeList" parameterType="com.bonus.sgzb.system.domain.SysNotice" resultMap="SysNoticeResult">
-        <include refid="selectNoticeVo"/>
+        select sn.notice_id,
+               sn.notice_title,
+               sn.notice_type,
+               cast(sn.notice_content as char) as notice_content,
+               sn.status,
+               sn.create_by,
+               su.nick_name,
+               sn.create_time,
+               sn.update_by,
+               sn.update_time,
+               sn.remark
+        from sys_notice sn left join sys_user su on sn.create_by = su.user_name
+        where 1=1
         <where>
 			<if test="noticeTitle != null and noticeTitle != ''">
-				AND notice_title like concat('%', #{noticeTitle}, '%')
+				AND sn.notice_title like concat('%', #{noticeTitle}, '%')
 			</if>
 			<if test="noticeType != null and noticeType != ''">
-				AND notice_type = #{noticeType}
+				AND sn.notice_type = #{noticeType}
 			</if>
 			<if test="createBy != null and createBy != ''">
-				AND create_by like concat('%', #{createBy}, '%')
+				AND sn.create_by like concat('%', #{createBy}, '%')
 			</if>
 		</where>
     </select>

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="requestMethod"  column="request_method" />
 		<result property="operatorType"   column="operator_type"  />
 		<result property="operName"       column="oper_name"      />
+		<result property="nickName"       column="nick_name"      />
 		<result property="deptName"       column="dept_name"      />
 		<result property="operUrl"        column="oper_url"       />
 		<result property="operIp"         column="oper_ip"        />
@@ -34,34 +35,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	
 	<select id="selectOperLogList" parameterType="com.bonus.sgzb.system.api.domain.SysOperLog" resultMap="SysOperLogResult">
-		<include refid="selectOperLogVo"/>
+		select sol.oper_id, sol.title, sol.business_type, sol.method, sol.request_method, sol.operator_type, sol.oper_name, su.nick_name, sol.dept_name, sol.oper_url, sol.oper_ip, sol.oper_param, sol.json_result, sol.status, sol.error_msg, sol.oper_time, sol.cost_time
+		from sys_oper_log sol left join sys_user su on sol.oper_name = su.user_name where 1=1
 		<where>
 			<if test="operIp != null and operIp != ''">
-				AND oper_ip like concat('%', #{operIp}, '%')
+				AND sol.oper_ip like concat('%', #{operIp}, '%')
 			</if>
 			<if test="title != null and title != ''">
-				AND title like concat('%', #{title}, '%')
+				AND sol.title like concat('%', #{title}, '%')
 			</if>
 			<if test="businessType != null">
-				AND business_type = #{businessType}
+				AND sol.business_type = #{businessType}
 			</if>
 			<if test="businessTypes != null and businessTypes.length > 0">
-			    AND business_type in
+			    AND sol.business_type in
 			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
 		 			#{businessType}
 		        </foreach> 
 			</if>
 			<if test="status != null">
-				AND status = #{status}
+				AND sol.status = #{status}
 			</if>
 			<if test="operName != null and operName != ''">
-				AND oper_name like concat('%', #{operName}, '%')
+				AND sol.oper_name like concat('%', #{operName}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND oper_time &gt;= #{params.beginTime}
+				AND sol.oper_time &gt;= #{params.beginTime}
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND oper_time &lt;= #{params.endTime}
+				AND sol.oper_time &lt;= #{params.endTime}
 			</if>
 		</where>
 		order by oper_id desc