Merge branch 'develop' of http://112.74.196.215:3000/Tech2/data-daq into develop

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

@@ -78,7 +78,10 @@ public class EmailTaskInfoDO {
      */
     @TableField(value = "updatetime")
     private Date updateTime;
-
+    /**
+     * 创建人
+     */
+    private String userName;
     public EmailTaskInfoVO toVO() {
         EmailTaskInfoVO vo = new EmailTaskInfoVO();
         vo.setId(this.id);
@@ -87,6 +90,7 @@ public class EmailTaskInfoDO {
         vo.setTaskName(this.taskName);
         vo.setTaskType(this.taskType);
         vo.setTaskStatus(this.taskStatus);
+        vo.setUserName(this.userName);
         vo.setStartTime(DateUtils.format(this.startTime,DateUtils.YYYY_MM_DD_HH_MM_SS));
         vo.setEndTime(DateUtils.format(this.endTime,DateUtils.YYYY_MM_DD_HH_MM_SS));
         vo.setUpdateTime(DateUtils.format(this.updateTime,DateUtils.YYYY_MM_DD_HH_MM_SS));

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

@@ -55,4 +55,8 @@ public class EmailTaskInfoVO {
      * 修改时间;第一次创建时与CreatTime值相同，修改时与修改时间相同
      */
     private String updateTime;
+    /**
+     * 创建人
+     */
+    private String userName;
 }

service-base/src/main/resources/mapper/EmailTaskInfoMapper.xml

@@ -38,47 +38,51 @@
     </delete>
     <select id="searchTaskList" resultMap="BaseResultMap"
             parameterType="com.simuwang.base.pojo.dto.query.TaskPageQuery">
-        select id,email, task_name,task_type, start_time, end_time, task_status,
-               isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.email_task_info
-        where isvalid=1
+        select task.id,task.email, task.task_name,task.task_type, task.start_time, task.end_time, task.task_status,
+        task.isvalid, task.creatorid, task.createtime, task.updaterid, task.updatetime,u.user_name
+        from PPW_EMAIL.email_task_info task
+        left join PPW_EMAIL.sys_user u
+        on task.creatorid=u.user_id
+        where task.isvalid=1
         <if test="email != null and email !=''">
-            and email like concat('%',#{email},'%')
+            and task.email like concat('%',#{email},'%')
         </if>
         <if test="taskName != null and taskName !=''">
-            and task_name like concat('%',#{taskName},'%')
+            and task.task_name like concat('%',#{taskName},'%')
         </if>
         <if test="startDate != null and startDate !=''">
-            and updatetime >= #{startDate}
+            and task.updatetime >= #{startDate}
         </if>
         <if test="taskType != null">
-            and task_type = #{taskType}
+            and task.task_type = #{taskType}
         </if>
         <if test="endDate != null and endDate !=''">
-            and updatetime <![CDATA[ <= ]]> #{endDate}
+            and task.updatetime <![CDATA[ <= ]]> #{endDate}
         </if>
-        order by updatetime desc
+        order by task.updatetime desc
         limit #{offset},#{pageSize}
     </select>
     <select id="countTaskList" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.TaskPageQuery">
         select count(1)
-        from PPW_EMAIL.email_task_info
-        where isvalid=1
+        from PPW_EMAIL.email_task_info task
+        left join PPW_EMAIL.sys_user u
+        on task.creatorid=u.user_id
+        where task.isvalid=1
         <if test="email != null and email !=''">
-            and email like concat('%',#{email},'%')
+            and task.email like concat('%',#{email},'%')
         </if>
         <if test="taskName != null and taskName !=''">
-            and task_name like concat('%',#{taskName},'%')
+            and task.task_name like concat('%',#{taskName},'%')
         </if>
         <if test="startDate != null and startDate !=''">
-            and updatetime >= #{startDate}
+            and task.updatetime >= #{startDate}
         </if>
         <if test="endDate != null and endDate !=''">
-            and updatetime <![CDATA[ <= ]]> #{endDate}
+            and task.updatetime <![CDATA[ <= ]]> #{endDate}
         </if>
         <if test="taskType != null">
-            and task_type = #{taskType}
+            and task.task_type = #{taskType}
         </if>
     </select>
 

service-daq/src/main/java/com/simuwang/daq/service/EmailParseApiServiceImpl.java

@@ -106,7 +106,8 @@ public class EmailParseApiServiceImpl implements EmailParseApiService {
                 emailTaskInfoDO.setCreatorId(UserUtils.getLoginUser().getUserId());
                 emailTaskInfoDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
             }catch (Exception e){
-
+                emailTaskInfoDO.setCreatorId(1);
+                emailTaskInfoDO.setUpdaterId(1);
             }
             emailTaskInfoMapper.insert(emailTaskInfoDO);
         }catch (Exception e){

service-manage/src/main/java/com/simuwang/manage/task/FundDeletionTask.java

@@ -86,7 +86,8 @@ public class FundDeletionTask {
                 emailTaskInfoDO.setCreatorId(UserUtils.getLoginUser().getUserId());
                 emailTaskInfoDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
             }catch (Exception e){
-
+                emailTaskInfoDO.setCreatorId(1);
+                emailTaskInfoDO.setUpdaterId(1);
             }
             emailTaskInfoMapper.insert(emailTaskInfoDO);
         }catch (Exception e){

service-manage/src/main/java/com/simuwang/manage/task/SendCompanyEmailTask.java

@@ -82,7 +82,8 @@ public class SendCompanyEmailTask {
                 emailTaskInfoDO.setCreatorId(UserUtils.getLoginUser().getUserId());
                 emailTaskInfoDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
             }catch (Exception e){
-
+                emailTaskInfoDO.setCreatorId(1);
+                emailTaskInfoDO.setUpdaterId(1);
             }
             emailTaskInfoMapper.insert(emailTaskInfoDO);
         }catch (Exception e){