Merge branch 'master' of http://101.36.160.140:21044/province-qinghai/base-server

# Conflicts:
#	base-server/src/main/resources/bootstrap-devmysql.yml

base-server/pom.xml

@@ -39,7 +39,12 @@
             <artifactId>druid</artifactId>
             <version>1.0.28</version>
         </dependency>
-
+        <!--mysql数据库-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.28</version>
+        </dependency>
 <!--	 	<dependency>-->
 <!--		  <groupId>com.alibaba</groupId>-->
 <!--		  <artifactId>druid-spring-boot-starter</artifactId>-->

base-server/src/main/java/com/unis/base/server/dao/UserSealRoleDao.java

@@ -13,6 +13,6 @@ import tk.mybatis.mapper.common.Mapper;
 @Transactional(rollbackFor = Exception.class)
 public interface UserSealRoleDao extends Mapper<UserSealRoleDo> {
 
-    @Select("select seals from usercenter:sys_user_info where user_loginname = #{accountName, jdbcType=VARCHAR} and state_code = 1")
+    @Select("select seals from usercenter.sys_user_info where user_loginname = #{accountName, jdbcType=VARCHAR} and state_code = 1")
     String getSealsByAccount(@Param("accountName") String accountName);
 }

base-server/src/main/java/com/unis/base/server/entity/DCfxxsjyDO.java

@@ -1,16 +1,6 @@
 package com.unis.base.server.entity;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.unis.base.common.vo.DCfxxsjyUpdateLogVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -18,6 +8,12 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.persistence.Column;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * @author huangxing
  * @version 1.0

base-server/src/main/java/com/unis/base/server/service/impl/CblyBbServiceImpl.java

@@ -1,37 +1,26 @@
 package com.unis.base.server.service.impl;
 
 
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-import javax.annotation.Resource;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.github.pagehelper.PageHelper;
 import com.unis.base.server.dao.TyChubeilyynbaoDao;
 import com.unis.base.server.entity.TyChubeilyynbao;
-import com.unis.base.server.entity.TyHly;
 import com.unis.base.server.example.TyChubeilyynbaoExample;
-import com.unis.base.server.example.TyHlyExample;
 import com.unis.base.server.example.TyChubeilyynbaoExample.Criteria;
 import com.unis.base.server.service.CblyBbService;
 import com.unis.common.utils.ResponseWrapper;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
-import aj.org.objectweb.asm.Type;
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 
 
 @Service

base-server/src/main/resources/bootstrap-devmysql.yml

@@ -14,9 +14,9 @@ spring:
     restart:
       enabled: false
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    #     url: jdbc:mysql://172.16.0.46:3306/base?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
-    url: jdbc:mysql://101.36.160.140:10311/base?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
+#    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://172.16.0.46:3306/base?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
+#    url: jdbc:mysql://101.36.160.140:10311/base?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
     username: root
     password: admin@1234
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -60,7 +60,7 @@ eureka:
   client:
     service-url:
 #      defaultZone: http://172.16.0.73:11000/eureka/
-      defaultZone: http://127.0.0.1:11000/eureka/
+      defaultZone: http://172.16.0.4:11000/eureka/
   instance:
     prefer-ip-address: true
     status-page-url-path: /swagger-ui.html

base-server/src/main/resources/mybatis/mapper/PersonnelMxMapper.xml

@@ -479,42 +479,42 @@
                status,
                newly
         from base.d_ryxxsjy
-        where rybh like '%'||#{rybh}||'%'
+        where rybh LIKE CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectEducation" resultType="com.unis.base.common.vo.EducationVO">
-        select *
-        from base.d_education
-        where rybh like '%'||#{rybh}||'%'
+        SELECT *
+        FROM base.d_education
+        WHERE rybh LIKE CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectReport" resultType="com.unis.base.common.vo.ReportVO">
         select *
         from base.d_report
-        where rybh like '%'||#{rybh}||'%'
+        where rybh like  CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectSkill" resultType="com.unis.base.common.vo.SkillVO">
         select *
         from base.d_skill
-        where rybh like '%'||#{rybh}||'%'
+        where rybh like CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectRotaterotateVO" resultType="com.unis.base.common.vo.RotaterotateVO">
         select *
         from base.d_rotaterotate
-        where rybh like '%'||#{rybh}||'%'
+        where rybh like CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectFeiEducationVO" resultType="com.unis.base.common.vo.FeiEducationVO">
         select *
         from base.d_feieducation
-        where rybh like '%'||#{rybh}||'%'
+        where rybh like CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectOtherCertificatesVO" resultType="com.unis.base.common.vo.OtherCertificatesVO">
         select *
         from base.d_certificates
-        where rybh like '%'||#{rybh}||'%'
+        where rybh like CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectDetailzs" resultType="com.unis.base.server.entity.PersonnelDO">
         select ryxm name, xb gender, zwmc post, zzmm politicalOutlook, lxdh telephone, person_status
         from base.d_ryxxsjy
-        where rybh like '%'||#{rybh}||'%'
+        where rybh like CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectduty1" resultType="com.unis.base.server.entity.QyiDo">
         SELECT
@@ -546,7 +546,7 @@
         <where>
             ry.status = 1
             <if test="qymc!=null and qymc!=''">
-                AND qy.qymc LIKE '%' || #{qymc} || '%'
+                AND qy.qymc  like CONCAT('%', #{qymc}, '%')
             </if>
             <if test="orgCode!=null and orgCode!=''">
                 AND qy.org_code = #{orgCode}
@@ -569,7 +569,7 @@
         from base.d_ryxxsjy
         <where>
             <if test="qymc!=null and qymc!=''">
-                and qymc like '%'||#{qymc}||'%'
+                and qymc  like CONCAT('%', #{qymc}, '%')
             </if>
             <if test="unittype!=null and unittype!=''">
                 and unittype=#{unittype}
@@ -637,7 +637,7 @@
                status,
                newly
         from base.d_ryxxsjy
-        where group_id like '%'||#{groupId}||'%'
+        where group_id like CONCAT('%', #{groupId}, '%')
     </select>
 
 

base-server/src/main/resources/mybatis/mapper/TalentGroupDao.xml

@@ -77,7 +77,7 @@
         select * from base.d_talent_group
         <where>
             <if test="groupName!=null and groupName!='' ">
-                and group_name like '%'||#{groupName}||'%'
+                and group_name  LIKE CONCAT('%', #{groupName}, '%')
             </if>
         </where>
     </select>
@@ -94,32 +94,32 @@
     <select id="selectEducation" resultType="com.unis.base.common.vo.EducationVO">
         select *
         from base.d_education
-        where rybh like '%'||#{rybh}||'%'
+        where rybh  LIKE CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectReport" resultType="com.unis.base.common.vo.ReportVO">
         select *
         from base.d_report
-        where rybh like '%'||#{rybh}||'%'
+        where rybh  LIKE CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectSkill" resultType="com.unis.base.common.vo.SkillVO">
         select *
         from base.d_skill
-        where rybh like '%'||#{rybh}||'%'
+        where rybh LIKE CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectRotaterotateVO" resultType="com.unis.base.common.vo.RotaterotateVO">
         select *
         from base.d_rotaterotate
-        where rybh like '%'||#{rybh}||'%'
+        where rybh LIKE CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectFeiEducationVO" resultType="com.unis.base.common.vo.FeiEducationVO">
         select *
         from base.d_feieducation
-        where rybh like '%'||#{rybh}||'%'
+        where rybh LIKE CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectOtherCertificatesVO" resultType="com.unis.base.common.vo.OtherCertificatesVO">
         select *
         from base.d_certificates
-        where rybh like '%'||#{rybh}||'%'
+        where rybh LIKE CONCAT('%', #{rybh}, '%')
     </select>
     <select id="selectpersonId" resultType="com.unis.base.common.vo.SelectPersonVo">
         select rybh userId
@@ -138,16 +138,30 @@
         where u.rybh=#{userId}
     </select>
     <select id="selectGroups" resultType="com.unis.base.common.vo.GroupPersonSVO">
-        select u.rybh,
+--         select u.rybh,
+--                u.ryxm,
+--                u.qymc,
+--                u.zwmc,
+--                e.quan_highest_education xw,
+--                (select wm_concat(r.honorary_name) from base.d_report r where r.rybh=u.rybh) rych,
+--                u.lxdh
+--         from base.d_ryxxsjy u
+--             left join base.d_education e on u.rybh=e.rybh
+--         where u.group_id LIKE CONCAT('%', #{groupId}, '%')
+
+        SELECT u.rybh,
                u.ryxm,
                u.qymc,
                u.zwmc,
-               e.quan_highest_education xw,
-               (select wm_concat(r.honorary_name) from base.d_report r where r.rybh=u.rybh) rych,
+               e.quan_highest_education AS xw,
+               GROUP_CONCAT(r.honorary_name ORDER BY r.honorary_name SEPARATOR ',') AS rych,
                u.lxdh
-        from base.d_ryxxsjy u
-            left join base.d_education e on u.rybh=e.rybh
-        where u.group_id like '%'||#{groupId}||'%'
+        FROM base.d_ryxxsjy u
+                 LEFT JOIN base.d_education e ON u.rybh = e.rybh
+                 LEFT JOIN base.d_report r ON u.rybh = r.rybh
+        WHERE u.group_id LIKE CONCAT('%', #{groupId}, '%')
+        GROUP BY u.rybh, u.ryxm, u.qymc, u.zwmc, e.quan_highest_education, u.lxdh
+
     </select>
     <select id="selectname" resultType="java.lang.String">
         select id
@@ -162,7 +176,7 @@
     <select id="selectBm" resultType="com.unis.base.common.vo.BmRecordVO">
         select distinct bmmc qymc, bmdm tyshxydm
         from base.d_ryxxsjy
-        where qymc like '%'||#{qymc}||'%'
+        where qymc LIKE CONCAT('%', #{qymc}, '%')
        and bmmc is not null
     </select>
     <select id="seleRy" resultType="com.unis.base.common.vo.BRyVO">
@@ -218,7 +232,7 @@
     <select id="selectPersons" resultType="java.lang.String">
         select rybh
         from base.d_ryxxsjy
-        where group_id like '%'||#{groupId}||'%'
+        where group_id  LIKE CONCAT('%', #{groupId}, '%')
     </select>
     <select id="selectGroupInfo" resultType="com.unis.base.server.entity.TalentGroupDO">
         select *