招生统计

src/main/java/com/xjrsoft/module/asset/mapper/WfAssetManageMapper.java

@@ -10,6 +10,7 @@ import com.xjrsoft.module.asset.entity.WfAssetManage;
 import com.xjrsoft.module.asset.vo.WfAssetManagePageVo;
 import com.xjrsoft.module.asset.vo.WfAssetManageQueryVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.io.ByteArrayOutputStream;
 import java.util.List;
@@ -25,7 +26,7 @@ public interface WfAssetManageMapper extends MPJBaseMapper<WfAssetManage> {
 
     IPage<WfAssetManagePageVo> getPage(IPage<WfAssetManagePageDto> page, WfAssetManagePageDto dto);
 
-    List<WfAssetManageQueryVo> listWfAssetManageSelectRecordQuery(WfAssetManageSelectRecordQueryDto dto);
+    List<WfAssetManageQueryVo> listWfAssetManageSelectRecordQuery(@Param("dto") WfAssetManageSelectRecordQueryDto dto);
 
-    List<WfAssetManageQueryVo> listWfAssetManageConditionalSearchQuery(WfAssetManageConditionalSearchQueryDto dto);
+    List<WfAssetManageQueryVo> listWfAssetManageConditionalSearchQuery(@Param("dto") WfAssetManageConditionalSearchQueryDto dto);
 }

src/main/java/com/xjrsoft/module/asset/vo/WfAssetManageQueryVo.java

@@ -49,14 +49,14 @@ public class WfAssetManageQueryVo {
      * 所属部门[xjr_department]
      */
     @ContentStyle(dataFormat = 49)
-    @ExcelProperty("所属部门[xjr_department]")
+    @ExcelProperty("所属部门")
     @ApiModelProperty("所属部门[xjr_department]")
     private String deptIdCn;
     /**
      * 使用人id[xjr_user]
      */
     @ContentStyle(dataFormat = 49)
-    @ExcelProperty("使用人id[xjr_user]")
+    @ExcelProperty("使用人id")
     @ApiModelProperty("使用人id[xjr_user]")
     private String userIdCn;
     /**

src/main/java/com/xjrsoft/module/student/service/impl/PbCseFeeobjupdateServiceImpl.java

@@ -62,12 +62,11 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
             lastDayOfMonthStr = lastDayOfMonth.format(formatter);
         }
 
-        //根据年月获取招生数量,毕业院校
+        //根据年月获取招生数量
         MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateByYearMonth = new MPJLambdaWrapper<>();
         pbCseFeeobjupdateByYearMonth
                 .distinct()
                 .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
-                .select("ifnull(t.graduations,'未知') as graduations")
                 .selectAs(PbCseFeeobjupdate::getCratetime, PbCseFeeobjupdate::getCratetime)
                 .eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
                 .between(PbCseFeeobjupdate::getCratetime, firstDayOfMonthStr, lastDayOfMonthStr)
@@ -89,8 +88,22 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
                 cratetimeRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
             }
 
+            result.setCratetimeList(cratetimeRes);
+        }
+
+        //根据天获取毕业院校
+        MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateByDay = new MPJLambdaWrapper<>();
+        pbCseFeeobjupdateByDay
+                .distinct()
+                .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
+                .select("ifnull(t.graduations,'未知') as graduations")
+                .eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
+                .like(dto.getDay() != null, PbCseFeeobjupdate::getCratetime, dto.getDay())
+        ;
+        List<PbCseFeeobjupdate> pbCseFeeobjupdateByDayList = this.selectJoinList(PbCseFeeobjupdate.class, pbCseFeeobjupdateByDay);
+        if(pbCseFeeobjupdateByDayList != null && !pbCseFeeobjupdateByDayList.isEmpty()){
             //毕业学校排行
-            Map<String, Long> graduations = pbCseFeeobjupdateByYearMonthList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getGraduations, Collectors.counting()));
+            Map<String, Long> graduations = pbCseFeeobjupdateByDayList.stream().collect(Collectors.groupingBy(PbCseFeeobjupdate::getGraduations, Collectors.counting()));
             if(!graduations.isEmpty()){
                 graduations = graduations.entrySet().stream()
                         .sorted(Map.Entry.<String, Long>comparingByValue().reversed())
@@ -103,10 +116,8 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
             }
 
             result.setGraduationList(graduationRes);
-            result.setCratetimeList(cratetimeRes);
         }
 
-
         //获取所有学生的信息
         MPJLambdaWrapper<PbCseFeeobjupdate> pbCseFeeobjupdateMPJLambdaWrapper = new MPJLambdaWrapper<>();
         pbCseFeeobjupdateMPJLambdaWrapper

src/main/java/com/xjrsoft/module/textbook/dto/EnrollmentStatisticsInfoDto.java

@@ -24,4 +24,10 @@ public class EnrollmentStatisticsInfoDto {
      */
     @ApiModelProperty("年月")
     private String yearMonth;
+    /**
+     * 年月日
+     */
+    @ApiModelProperty("年月日")
+    private String day;
+
 }

src/main/resources/mapper/asset/WfAssetManageMapper.xml

@@ -29,7 +29,7 @@
             and t.asset_species = #{dto.assetSpecies}
         </if>
         <if test="dto.name != null and dto.name != ''">
-            and t.name = #{dto.name}
+            and t.name like concat('%', #{dto.name}, '%')
         </if>
         <if test="dto.deptId != null and dto.deptId != ''">
             and t.dept_id = #{dto.deptId}
@@ -90,7 +90,7 @@
             and t.asset_species = #{dto.assetSpecies}
         </if>
         <if test="dto.name != null and dto.name != ''">
-            and t.name = #{dto.name}
+            and t.name like concat('%', #{dto.name}, '%')
         </if>
         <if test="dto.deptId != null and dto.deptId != ''">
             and t.dept_id = #{dto.deptId}