企业端岗位总体信息

inventory-dao/src/main/java/com/rzyc/model/log/SysLogs.java

@@ -1,5 +1,6 @@
 package com.rzyc.model.log;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -38,6 +39,7 @@ public class SysLogs implements Serializable {
     @ApiModelProperty("ip地址")
     private String ipAddress;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("时间")
     private Date createTime;
 

inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml

@@ -2608,7 +2608,10 @@
   </select>
 
   <select id="findEnterpriseByPhoneNumber" resultMap="BaseResultMap">
-    select sysent.EntName,sysent.state,sysent.SysEnterpriseId,sysent.EntName from ent_user eu left join sysenterprise sysent on eu.enterprise_id = sysent.SysEnterpriseId where eu.mobile = #{entUserPhone}
+    select sysent.EntName,sysent.state,sysent.SysEnterpriseId,sysent.EntName
+    from ent_user eu
+        left join sysenterprise sysent on eu.enterprise_id = sysent.SysEnterpriseId
+    where eu.account = #{entUserPhone}
   </select>
 
   <insert id="insertList">

inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java

@@ -205,6 +205,9 @@ public class PcBusinessService extends BaseController {
     @PageOperation
     public SingleResult entUserList(String keyContent,Integer page,Integer pageSize,String postId,String enterpriseId,Integer userType){
         SingleResult singleResult = new SingleResult();
+        if("company".equals(postId) ){
+            postId = "";
+        }
         Page<EntUser>users = (Page<EntUser>) entUserMapper.selectEntUserList(keyContent,postId,enterpriseId,userType);
         //计算履职百分比,后期这里使用redis来读取履职进度
         for (EntUser e:users.getResult()) {

inventory-ent/src/main/resources/application-prod.yml

@@ -2,6 +2,21 @@ server:
   port: 7011
 
 spring:
+  redis:
+    host: 42.193.40.239
+    Auth: redis@rzyc123456
+    #    进入哨兵项目-这个端口就不用了，除非是单体
+    #    port: 6379
+    sentinel:
+      master: mymaster
+      nodes: 42.193.40.239:26379,42.193.40.239:26380,42.193.40.239:26381
+    lettuce:
+      pool:
+        max-active: 8
+        max-idle: 8
+        min-idle: 0
+        max-wait: 100
+      shutdown-timeout: 50000
   servlet:
     multipart:
       enabled: true

inventory-ent/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev #设定打包配置文件
+    active: prod #设定打包配置文件