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

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

@@ -49,6 +49,7 @@ import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -89,6 +90,12 @@ public class TeacherAwardController {
     @SaCheckPermission("teacheraward:detail")
     public RT<PageOutput<TeacherAwardDetailPageVo>> detailPage(@Valid TeacherAwardDetailPageDto dto){
         MPJLambdaWrapper<TeacherAward> teacherAwardMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        LocalDateTime createTimeStart = null;
+        LocalDateTime createTimeEnd = null;
+        if(ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd())){
+            createTimeStart = dto.getCreateDateStart().atTime(0, 0, 0);
+            createTimeEnd = dto.getCreateDateEnd().atTime(23, 59, 59);
+        }
         teacherAwardMPJLambdaWrapper
                 .disableSubLogicDel()
                 .selectAs(TeacherAwardItem::getIsThesis, TeacherAwardDetailPageVo::getIsThesis)
@@ -103,7 +110,7 @@ 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()))
-                .between((ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd())),TeacherAward::getCreateDate, dto.getCreateDateStart(), dto.getCreateDateEnd())
+                .between((ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd())),TeacherAward::getCreateDate, createTimeStart, createTimeEnd)
                 .orderByDesc(TeacherAward::getId)
         ;
         IPage<TeacherAwardDetailPageVo> page = teacherAwardService.selectJoinListPage(ConventPage.getPage(dto), TeacherAwardDetailPageVo.class, teacherAwardMPJLambdaWrapper);

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

@@ -14,7 +14,7 @@
             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}
+            and DATE_FORMAT(a1.create_date, '%Y-%m-%d') between #{dto.createDateStart} and #{dto.createDateEnd}
         </if>
         AND a3.current_state = 'COMPLETED'
         ) AS score FROM xjr_user t1
@@ -31,7 +31,7 @@
             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}
+            and DATE_FORMAT(a1.create_date, '%Y-%m-%d') between #{dto.createDateStart} and #{dto.createDateEnd}
         </if>
         AND a3.current_state = 'COMPLETED'
         )  IS NOT NULL
@@ -57,6 +57,9 @@
         <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 DATE_FORMAT(a1.create_date, '%Y-%m-%d') between #{dto.createDateStart} and #{dto.createDateEnd}
+        </if>
         ) 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

src/main/resources/sqlScript/学生异动视图.sql

@@ -1,32 +1,62 @@
+-- 正式环境视图
 DROP VIEW IF EXISTS cse_feeobj_change1;
 CREATE VIEW cse_feeobj_change1 AS
-SELECT '1001' AS Pk_corp,NULL AS remarks,t1.user_id AS pkfeeobj,t4.classcode,t7.speccode AS pkspec,
+SELECT DISTINCT '1001' AS Pk_corp,NULL AS remarks,t1.user_id AS pkfeeobj,t5.code AS classcode,t6.code AS pkspec,
 IF(t1.change_type = 'student_type',t1.before_data,NULL) AS resourcecode, 
-IF(t1.change_type = 'stduy_status',t1.before_data,NULL) AS quartercode,t9.deptcode,
+IF(t1.change_type = 'stduy_status',t1.before_data,NULL) AS quartercode,t8.code AS deptcode,
 NULL AS enteryear, NULL AS leaveyear,NULL AS ratetypecode,
 IF(t1.change_type = 'archives_status',t1.before_data,NULL) AS state,
-t10.classcode AS newclasscode,t13.speccode AS newpkspec,
+t11.code AS newclasscode,t12.code AS newpkspec,
 IF(t1.change_type = 'student_type',t1.after_data,NULL) AS newresourcecode, 
 IF(t1.change_type = 'stduy_status',t1.after_data,NULL) AS newquartercode,
-t15.deptcode AS newdeptcode,NULL AS newenteryear, NULL AS newleaveyear,NULL AS newratetypecode,
+t14.code AS newdeptcode,NULL AS newenteryear, NULL AS newleaveyear,NULL AS newratetypecode,
 IF(t1.change_type = 'archives_status',t1.after_data,NULL) AS newstate,
 t16.name AS operator,DATE_FORMAT(t1.create_date, '%Y-%m-%d') AS opertordate,t1.id AS pkfeeobjchange,t2.credential_number AS Personalid,t2.name AS Feeobjname,
-t17.student_id AS Studentcode,NULL AS biztype,NULL AS delflag,NULL AS updateflag,NULL AS fid
+t17.student_id AS Studentcode,NULL AS biztype,NULL AS delflag,NULL AS updateflag
 FROM student_change_record t1
 INNER JOIN xjr_user t2 ON t1.user_id = t2.id
 LEFT JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
-LEFT JOIN pb_cse_class1 t4 ON t4.specname = t1.before_data AND t1.change_type = 'change_class'
 LEFT JOIN base_class t5 ON t1.before_data_code = t5.id AND t1.change_type = 'change_class'
 LEFT JOIN base_major_set t6 ON t5.major_set_id = t6.id
-LEFT JOIN pb_cse_spec1 t7 ON t6.name = t7.specname
 LEFT JOIN xjr_department t8 ON t5.org_id = t8.id AND t1.change_type = 'change_class'
-LEFT JOIN pb_bd_dept1 t9 ON t8.name = t9.deptname
-LEFT JOIN pb_cse_class1 t10 ON t10.specname = t1.after_data AND t1.change_type = 'change_class'
 LEFT JOIN base_class t11 ON t1.after_data_code = t11.id AND t1.change_type = 'change_class'
 LEFT JOIN base_major_set t12 ON t11.major_set_id = t12.id
-LEFT JOIN pb_cse_spec1 t13 ON t12.name = t13.specname
 LEFT JOIN xjr_department t14 ON t11.org_id = t14.id AND t1.change_type = 'change_class'
-LEFT JOIN pb_bd_dept1 t15 ON t14.name = t15.deptname
 LEFT JOIN xjr_user t16 ON t16.id = t1.create_user_id
 INNER JOIN base_student t17 ON t1.user_id = t17.user_id
-WHERE t1.delete_mark = 0 AND t1.enabled_mark = 1;
+WHERE t1.delete_mark = 0 AND t1.enabled_mark = 1 ;
+
+
+-- 中台数据表
+CREATE TABLE `test_cse_feeobj_change1`(
+           `Pk_corp`  CHAR(4) DEFAULT NULL,
+         `remarks`  VARCHAR(255) DEFAULT NULL,
+         `pkfeeobj`  VARCHAR(40)  DEFAULT NULL,
+         `classcode`  VARCHAR(20)  DEFAULT NULL,
+         `pkspec`  VARCHAR(40) DEFAULT NULL,
+         `resourcecode`  VARCHAR(30) DEFAULT NULL,
+         `quartercode`  VARCHAR(30) DEFAULT NULL,
+         `deptcode`  VARCHAR(30) DEFAULT NULL,
+         `enteryear`  VARCHAR(10) DEFAULT NULL,
+         `leaveyear`  VARCHAR(10) DEFAULT NULL,
+         `ratetypecode`  VARCHAR(30) DEFAULT NULL,
+         `state`  VARCHAR(50) DEFAULT NULL,
+         `newclasscode`  VARCHAR(40) DEFAULT NULL,
+         `newpkspec`  VARCHAR(40) DEFAULT NULL,
+         `newresourcecode`  VARCHAR(30) DEFAULT NULL,
+         `newquartercode`  VARCHAR(30) DEFAULT NULL,
+         `newdeptcode`  VARCHAR(40) DEFAULT NULL,
+         `newenteryear`  VARCHAR(10) DEFAULT NULL,
+         `newleaveyear`  VARCHAR(10) DEFAULT NULL,
+         `newratetypecode`  VARCHAR(30) DEFAULT NULL,
+         `newstate`  VARCHAR(10) DEFAULT NULL,
+         `operator`  VARCHAR(20) DEFAULT NULL,
+         `opertordate`  CHAR(10) DEFAULT NULL,
+         `pkfeeobjchange`  VARCHAR(40) DEFAULT NULL,
+         `Personalid`  VARCHAR(20) DEFAULT NULL,
+         `Feeobjname`  VARCHAR(60) DEFAULT NULL,
+         `Studentcode`  VARCHAR(30) DEFAULT NULL,
+         `biztype`  VARCHAR(10) DEFAULT NULL,
+         `delflag`  VARCHAR(10) DEFAULT NULL,
+         `updateflag`  CHAR(1) DEFAULT NULL
+)ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='VIEW';