人员id修改

src/main/java/cn/cslg/pas/common/model/cronModel/Personnel.java

@@ -20,6 +20,7 @@ public class Personnel  {
      * 人员账号
      */
      private  Integer id;
+     private Integer guid;
     private String personnelUserName;
 
     /**

src/main/java/cn/cslg/pas/common/model/cronModel/PersonnelVO.java

@@ -19,6 +19,8 @@ public class PersonnelVO {
      */
     private Integer id;
 
+    private String guid;
+
     /**
      * Front:姓名
      * Back:人员名称

src/main/java/cn/cslg/pas/common/vo/business/EventVO.java

@@ -41,7 +41,7 @@ public class EventVO {
     @Schema(description = "创建人")
     private String createName;
     @Schema(description = "创建人Id")
-    private Integer createId;
+    private String createId;
     @Schema(description = "报告数量")
     private Integer reportProjectNum;
     @Schema(description = "专题库数量")

src/main/java/cn/cslg/pas/domain/business/Event.java

@@ -37,7 +37,7 @@ public class Event extends BaseEntity<Event> {
     @TableField(value = "tenant_id")
     private Integer tenantId;
     @TableField(value = "create_id")
-    private Integer createId;
+    private String createId;
     @TableField(value = "create_time")
     private DateTime createTime;
 }

src/main/java/cn/cslg/pas/domain/business/PatentProject.java

@@ -0,0 +1,37 @@
+package cn.cslg.pas.domain.business;
+
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * <p>
+ * 专利数据库
+ * </p>
+ *
+ * @author 李仁杰
+ * @since 2022-11-1
+ */
+@Data
+@TableName("patent_project")
+public class PatentProject extends BaseEntity<PatentProject> {
+    /**
+     * 项目id
+     */
+    @TableField(value = "project_id")
+    private String project_id;
+
+    /**
+     * 是否更新
+     */
+    @TableField(value = "if_update")
+    private  Boolean ifUpdate;
+
+    /**
+     * 更新周期
+     */
+    private String crons;
+
+}

src/main/java/cn/cslg/pas/domain/business/Project.java

@@ -0,0 +1,90 @@
+package cn.cslg.pas.domain.business;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 项目表
+ * </p>
+ *
+ * @author 李仁杰
+ * @since 2022-10-20
+ */
+@Data
+@TableName("project")
+/*数据库中的表对应的类
+ */
+public class Project extends BaseEntity<Project> {
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 委托类型（1客户，2部门）
+     */
+    @TableField(value = "entrust_type")
+    private Integer entrustType;
+
+    /**
+     * 委托方id
+     */
+    @TableField(value = "entrust_id")
+    private Integer entrust_id;
+
+    /**
+     * 负责人id
+     */
+    @TableField(value = "head_id")
+    private Integer headId;
+
+    /**
+     * 负责部门id
+     */
+    @TableField(value = "department_id")
+    private Integer departmentId;
+
+    /**
+     * 项目类型（1专题库 2报告 3专利挖掘项目）
+     */
+    @TableField(value = "type")
+    private Integer type;
+
+    /**
+     * 合同号
+     */
+    @TableField(value = "contract_no")
+    private String contractNo;
+
+    /**
+     * 内部卷号
+     */
+    @TableField(value = "volume_number")
+    private String volumeNumber;
+
+    /**
+     * 委案日
+     */
+    @TableField(value = "commission_case_day")
+    private String commissionCaseDay;
+
+
+    @TableField(value = "description")
+    private String description;
+
+
+    @TableField(value = "tenant_id")
+    private Integer tenantId;
+
+
+    @TableField(value = "create_id")
+    private String createId;
+
+
+    @TableField(value = "create_time")
+    private DateTime createTime;
+}

src/main/java/cn/cslg/pas/factorys/getOrderFactory/GetCreateNameOrder.java

@@ -20,11 +20,11 @@ public class GetCreateNameOrder implements GetOrderObject {
 
     @Override
     public String getOrderString(String orderBy, Integer orderType) {
-        List<Integer> ids = new ArrayList<>();
+        List<String> ids = new ArrayList<>();
         //根据名称查询人员id
         try {
             String json = permissionService.getPersonIdOrders(orderType);
-            ids = JSON.parseArray(json, Integer.class);
+            ids = JSON.parseArray(json, String.class);
         } catch (Exception e) {
         }
         String idStr = StringUtils.join(ids, ",");

src/main/java/cn/cslg/pas/factorys/getSqlFactorys/GetCreateNameSql.java

@@ -22,7 +22,7 @@ public class GetCreateNameSql implements GetSqlObject{
     public String getSql( String value) {
         Boolean ifEqual= false;
         //根据名称查询人员id
-        List<Integer> ids = null;
+        List<String> ids = null;
         if(sqlObject.getOption()=="contain")
         {
             sqlObject.setOption(" in ");
@@ -37,12 +37,12 @@ public class GetCreateNameSql implements GetSqlObject{
        //根据名称查询
         try {
         String json =  permissionService.getPersonIdByNamePCS(value,ifEqual);
-           ids = JSON.parseArray(json,Integer.class);
+           ids = JSON.parseArray(json,String.class);
         }catch (Exception e){
         }
         if(ids==null||ids.size()==0){
             ids =new ArrayList<>();
-            ids.add(0);
+            ids.add("0");
         }
         String idStr = StringUtils.join(ids,",");
         String re = sqlObject.getSqlField()+sqlObject.getOption()+"("+idStr+")";

src/main/java/cn/cslg/pas/service/business/EventService.java

@@ -129,7 +129,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         //事件入库
         Event event = new Event();
         BeanUtils.copyProperties(eventDTO, event);
-        event.setCreateId(personnelVO.getId());
+        event.setCreateId(personnelVO.getGuid());
         event.setTenantId(personnelVO.getTenantId());
         event.insert();
         if (files != null && files.size() != 0) {
@@ -295,11 +295,10 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
      * @param eventVOs
      */
     private void loadEvent(List<EventVO> eventVOs) throws IOException {
-        List<Integer> createIds = new ArrayList<>();
+        List<String> createIds = new ArrayList<>();
         List<Integer> clientIds = new ArrayList<>();
         List<Integer> ids = new ArrayList<>();
         List<EventCountVO> eventCountVOS = new ArrayList<>();
-
         //获得所有文件的guid
         eventVOs.forEach(
                 item -> {

src/main/java/cn/cslg/pas/service/permissions/PermissionService.java

@@ -57,7 +57,7 @@ public class PermissionService {
      * @param ids 人员ids
      * @return 返回装载着人员列表数据的data的String
      */
-    public String getPersonnelByIdsFromPCS(List<Integer> ids) throws IOException {
+    public String getPersonnelByIdsFromPCS(List<String> ids) throws IOException {
         String param = new Gson().toJson(ids);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         OkHttpClient okHttpClient = new OkHttpClient.Builder()