Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/oa/dto/ProclamationPageDto.java

@@ -4,9 +4,12 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  *
@@ -36,4 +39,13 @@ public class ProclamationPageDto extends PageInput {
      */
     @ApiModelProperty(value = "当前用户id", hidden = true)
     private Long loginId;
+
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建日期-开始")
+    private LocalDateTime createDateStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建日期-结束")
+    private LocalDateTime createDateEnd;
 }

src/main/java/com/xjrsoft/module/oa/entity/News.java

@@ -126,4 +126,10 @@ public class News extends AuditEntity implements Serializable {
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "newsId")
     private List<NewsAppendix> appendixList;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty("创建人id")
+    private Long createUserId;
 }

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -64,6 +64,7 @@ import com.xjrsoft.module.organization.service.IWeChatService;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
 import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.teacher.entity.TeacherAward;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
 import lombok.AllArgsConstructor;
@@ -268,12 +269,15 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         queryNews
                 .select(News::getId)
                 .selectAs(Department::getName, ProclamationPageVo::getSendDeptIdCN)
+                .selectAs(User::getName, ProclamationPageVo::getCreateUserName)
                 .select(News.class, x -> VoToColumnUtil.fieldsToColumns(ProclamationPageVo.class).contains(x.getProperty()))
                 .leftJoin(Department.class, Department::getId, News::getSendDeptId)
+                .leftJoin(User.class, User::getId, News::getCreateUserId)
                 .eq(!StpUtil.getRoleList().contains("GongGao"), News::getCreateUserId, StpUtil.getLoginIdAsLong())
                 .eq(News::getTypeId, 2)
                 .like(dto.getFullHead() != null, News::getFullHead, dto.getFullHead())
                 .like(dto.getKeyword() != null, News::getNewsContent, dto.getKeyword())
+                .between((ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd())), News::getCreateDate, dto.getCreateDateStart(), dto.getCreateDateEnd())
                 .orderByDesc(News::getId)
                 .disableSubLogicDel();
         IPage<ProclamationPageVo> page = this.selectJoinListPage(ConventPage.getPage(dto), ProclamationPageVo.class, queryNews);

src/main/java/com/xjrsoft/module/oa/vo/ProclamationPageVo.java

@@ -82,4 +82,11 @@ public class ProclamationPageVo {
      */
     @ApiModelProperty("状态 1=未发布 2=已发布 3=下架")
     private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+
+
+    @ApiModelProperty("创建人姓名")
+    private String createUserName;
 }

src/main/java/com/xjrsoft/module/teacher/controller/TeacherAwardController.java

@@ -103,7 +103,8 @@ public class TeacherAwardController {
                 .like(dto.getWholeCompetitionName() != null && !dto.getWholeCompetitionName().equals(""),TeacherAward::getWholeCompetitionName, dto.getWholeCompetitionName())
                 .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
                 .and((ObjectUtil.isNotNull(dto.getIssueDateStart()) && ObjectUtil.isNotNull(dto.getIssueDateEnd())), wq -> wq.between(TeacherAward::getAwardDate, dto.getIssueDateStart(), dto.getIssueDateEnd()).or().between(TeacherAward::getIssueDate, dto.getIssueDateStart(), dto.getIssueDateEnd()))
-                .orderByDesc(TeacherAward::getCreateDate)
+                .between((ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd())),TeacherAward::getCreateDate, dto.getCreateDateStart(), dto.getCreateDateEnd())
+                .orderByDesc(TeacherAward::getId)
         ;
         IPage<TeacherAwardDetailPageVo> page = teacherAwardService.selectJoinListPage(ConventPage.getPage(dto), TeacherAwardDetailPageVo.class, teacherAwardMPJLambdaWrapper);
 

src/main/java/com/xjrsoft/module/teacher/dto/TeacherAwardDetailPageDto.java

@@ -46,4 +46,12 @@ public class TeacherAwardDetailPageDto extends PageInput {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("获奖/发表时间-结束")
     private LocalDate issueDateEnd;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("创建日期-开始")
+    private LocalDate createDateStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("创建日期-结束")
+    private LocalDate createDateEnd;
 }

src/main/java/com/xjrsoft/module/teacher/dto/TeacherAwardStatisticsPageDto.java

@@ -35,4 +35,12 @@ public class TeacherAwardStatisticsPageDto extends PageInput {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("获奖日期-结束")
     private LocalDate awardDateEnd;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("创建日期-开始")
+    private LocalDate createDateStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("创建日期-结束")
+    private LocalDate createDateEnd;
 }

src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailPageVo.java

@@ -46,6 +46,10 @@ public class TeacherAwardDetailPageVo {
      */
     @ApiModelProperty("奖项名称")
     private String competitionName;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
     /**
      * 奖项名称
      */

src/main/resources/mapper/teacher/TeacherAwardItemMapper.xml

@@ -7,11 +7,16 @@
         SELECT t1.id, t1.user_name, t1.name,t1.code,t3.name AS gender_cn,t1.mobile,
         (SELECT SUM(a2.score) FROM teacher_award a1
         INNER JOIN teacher_award_item a2 ON a1.teacher_award_item_id = a2.id
-        WHERE a1.status = 1 AND a1.delete_mark = 0 AND a2.delete_mark = 0
+        INNER JOIN xjr_workflow_form_relation a3 ON a1.id = CAST(a3.form_key_value AS SIGNED)
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
         AND a1.applicant_user_id = t1.id
         <if test="dto.awardDateStart != null and dto.awardDateEnd != null">
             and a1.award_date between #{dto.awardDateStart} and #{dto.awardDateEnd}
         </if>
+        <if test="dto.createDateStart != null and dto.createDateEnd != null">
+            and a1.create_date between #{dto.createDateStart} and #{dto.createDateEnd}
+        </if>
+        AND a3.current_state = 'COMPLETED'
         ) AS score FROM xjr_user t1
         INNER JOIN base_teacher t2 ON t1.id = t2.user_id
         left join xjr_user_dept_relation t4 on t4.user_id = t1.id
@@ -19,11 +24,16 @@
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
         AND (SELECT SUM(a2.score) FROM teacher_award a1
         INNER JOIN teacher_award_item a2 ON a1.teacher_award_item_id = a2.id
-        WHERE a1.status = 1 AND a1.delete_mark = 0 AND a2.delete_mark = 0
+        INNER JOIN xjr_workflow_form_relation a3 ON a1.id = CAST(a3.form_key_value AS SIGNED)
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
         AND a1.applicant_user_id = t1.id
         <if test="dto.awardDateStart != null and dto.awardDateEnd != null">
             and a1.award_date between #{dto.awardDateStart} and #{dto.awardDateEnd}
         </if>
+        <if test="dto.createDateStart != null and dto.createDateEnd != null">
+            and a1.create_date between #{dto.createDateStart} and #{dto.createDateEnd}
+        </if>
+        AND a3.current_state = 'COMPLETED'
         )  IS NOT NULL
         <if test="dto.userName != null and dto.userName != '' ">
             and t1.user_name like concat('%', #{dto.userName}, '%')
@@ -41,8 +51,9 @@
         SELECT t1.id, t1.user_name, t1.name,t1.code,t3.name AS gender_cn,t1.mobile,
         (SELECT SUM(a2.score) FROM teacher_award a1
         INNER JOIN teacher_award_item a2 ON a1.teacher_award_item_id = a2.id
-        WHERE a1.status = 1 AND a1.delete_mark = 0 AND a2.delete_mark = 0
-        AND a1.applicant_user_id = t1.id
+        INNER JOIN xjr_workflow_form_relation a3 ON a1.id = CAST(a3.form_key_value AS SIGNED)
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
+        AND a1.applicant_user_id = t1.id AND a3.current_state = 'COMPLETED'
         <if test="dto.awardDateStart != null and dto.awardDateEnd != null">
             and a1.award_date between #{dto.awardDateStart} and #{dto.awardDateEnd}
         </if>