招生统计

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

@@ -64,7 +64,7 @@ public class WfAssetManagePageVo {
      * 所属部门[xjr_department]
      */
     @ApiModelProperty("所属部门[xjr_department]")
-    private Long deptIdCn;
+    private String deptIdCn;
     /**
     * 使用人id[xjr_user]
     */
@@ -74,7 +74,7 @@ public class WfAssetManagePageVo {
      * 使用人id[xjr_user]
      */
     @ApiModelProperty("使用人id[xjr_user]")
-    private Long userIdCn;
+    private String userIdCn;
     /**
     * 金额
     */

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

@@ -89,7 +89,9 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
 
         if(enrollmentStatisticsInfoVo != null){
             result.setPayers(enrollmentStatisticsInfoVo.getPayers());
-            result.setRecordedAmountOfMoney(enrollmentStatisticsInfoVo.getRecordedAmountOfMoney().setScale(2, RoundingMode.DOWN));
+            if(enrollmentStatisticsInfoVo.getRecordedAmountOfMoney() != null){
+                result.setRecordedAmountOfMoney(enrollmentStatisticsInfoVo.getRecordedAmountOfMoney().setScale(2, RoundingMode.DOWN));
+            }
         }
 
         return result;

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

@@ -5,6 +5,37 @@
 <mapper namespace="com.xjrsoft.module.asset.mapper.WfAssetManageMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.asset.dto.WfAssetManagePageDto"
             resultType="com.xjrsoft.module.asset.vo.WfAssetManagePageVo">
-
+        select
+            t.*,
+            t1.name as assetTypeCn,
+            t2.name as assetCategoryCn,
+            t3.name as assetSpeciesCn,
+            t4.name as deptIdCn,
+            t5.name as userIdCn
+        from wf_asset_manage t
+                 left join xjr_dictionary_detail t1 on t1.code = t.asset_type and t1.item_id = '1773620475495190530'
+                 left join xjr_dictionary_detail t2 on t2.code = t.asset_category and t2.item_id = '1773620610862157826'
+                 left join xjr_dictionary_detail t3 on t3.code = t.asset_species and t3.item_id = '1773620783726202882'
+                 left join xjr_department t4 on t4.id = t.dept_id
+                 left join xjr_user t5 on t5.id = t.user_id
+        where t.status = 1
+        <if test="dto.assetType != null and dto.assetType != ''">
+            and t.asset_type = #{dto.assetType}
+        </if>
+        <if test="dto.assetCategory != null and dto.assetCategory != ''">
+            and t.asset_category = #{dto.assetCategory}
+        </if>
+        <if test="dto.assetSpecies != null and dto.assetSpecies != ''">
+            and t.asset_species = #{dto.assetSpecies}
+        </if>
+        <if test="dto.name != null and dto.name != ''">
+            and t.name = #{dto.name}
+        </if>
+        <if test="dto.deptId != null and dto.deptId != ''">
+            and t.dept_id = #{dto.deptId}
+        </if>
+        <if test="dto.userId != null and dto.userId != ''">
+            and t1.user_id = #{dto.userId}
+        </if>
     </select>
 </mapper>