fix: 公司对接增加附件功能

service-base/src/main/java/com/simuwang/base/pojo/dos/CompanyContactInfoDO.java

@@ -109,6 +109,15 @@ public class CompanyContactInfoDO {
     @TableField("isvalid")
     private Integer isvalid;
 
+    @TableField("file_id")
+    private Integer fileId;
+
+    @TableField(exist = false)
+    private String fileName;
+
+    @TableField(exist = false)
+    private String filePath;
+
 
     public CompanyContactInfoVO toVO() {
         CompanyContactInfoVO vo = new CompanyContactInfoVO();
@@ -122,6 +131,9 @@ public class CompanyContactInfoDO {
         vo.setCustomerManager(this.customerManager);
         vo.setSignMethod(this.signMethod);
         vo.setCreatorId(this.creatorId);
+        vo.setFileId(this.fileId);
+        vo.setFileName(this.fileName);
+        vo.setFilePath(this.filePath);
         vo.setUpdaterId(this.updaterId);
         vo.setUpdateTime(DateUtils.format(this.updateTime,DateUtils.YYYY_MM_DD_HH_MM_SS));
         vo.setCreateTime(DateUtils.format(this.createTime,DateUtils.YYYY_MM_DD_HH_MM_SS));

service-base/src/main/java/com/simuwang/base/pojo/vo/CompanyContactInfoVO.java

@@ -76,4 +76,10 @@ public class CompanyContactInfoVO {
     private String contactWechat;
 
     private String contactEmail;
+
+    private Integer fileId;
+
+    private String fileName;
+
+    private String filePath;
 }

service-base/src/main/resources/mapper/daq/CompanyContactInfoMapper.xml

@@ -169,7 +169,7 @@
         <result column="contact_wechat" property="contactWechat" jdbcType="VARCHAR" />
         <result column="contact_position" property="contactPosition" jdbcType="VARCHAR" />
         <result column="file_Id" property="fileId" jdbcType="INTEGER" />
-        <result column="fileName" property="fileName" jdbcType="VARCHAR" />
+        <result column="file_name" property="fileName" jdbcType="VARCHAR" />
         <result column="file_path" property="filePath" jdbcType="VARCHAR" />
         <result column="creatorid" property="creatorId" jdbcType="INTEGER" />
     </resultMap>
@@ -189,7 +189,7 @@
                  info.contact_status,
                  info.contact_id,
                  ci.contact_remark,
-                 ci.file_id,
+                 info.file_id,
                  f.file_name,
                  f.file_path,
                  info.creatorid
@@ -197,7 +197,7 @@
         left join contact_information ci
          on info.company_id = ci.company_id and ci.isvalid=1 and info.contact_id= ci.id
         left join image_info f
-         on ci.file_id = f.id and f.isvalid=1
+         on info.file_id = f.id and f.isvalid=1
         where info.company_id = #{companyId} and info.isvalid=1
         order by info.contact_date desc
         limit #{offset},#{pageSize}

service-manage/src/main/java/com/simuwang/manage/init/CompleteScheduleConfig.java

@@ -151,7 +151,7 @@ public class CompleteScheduleConfig implements SchedulingConfigurer {
                 triggerContext -> {
                     String cron = sysConfigMapper.selectConfigByKey("ppw_send_task_time");
                     if(cron == null){
-                        cron = "0 0 8-22 * * ?";
+                        cron = "0 0 8 * * ?";
                     }
                     logger.info("计算排排缺失数据邮箱发送任务定时任务轮训时间："+cron);
                     //2.2 返回执行周期(Date)