浏览代码

Merge branch 'test'

yangzian 3 年之前
父节点
当前提交
36fd3c9714

+ 4 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/vo/ProfitReportBytedanceVo.java

@@ -44,6 +44,10 @@ public class ProfitReportBytedanceVo implements Serializable {
     @Excel(name = "运营所属区域",width = 12)
     private String operateArea;
 
+    @Excel(name = "政策起止时间",width = 30)
+    private String time;
+
+
 
 
 }

+ 3 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/vo/ProfitReportKuaiShouVo.java

@@ -49,6 +49,9 @@ public class ProfitReportKuaiShouVo implements Serializable {
     @Excel(name = "运营所属区域",width = 12)
     private String operateArea;
 
+    @Excel(name = "政策起止时间",width = 30)
+    private String time;
+
 
 
 }

+ 7 - 8
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/ReportSettlementMapper.xml

@@ -330,16 +330,15 @@
         <if test="productName !=null and productName != ''">
             AND r.product_name = #{productName}
         </if>
+        <if test="startTime !=null and startTime != ''">
+            AND  r.policy_date &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            AND r.policy_date &lt;= #{endTime}
+        </if>
         GROUP BY r.policy_id
         ) t
-<where>
-    <if test="startTime !=null and startTime != ''">
-        AND (t.policyStartDate &gt;= #{startTime} or t.policyStartDate &lt;= #{endTime})
-    </if>
-    <if test="endTime !=null and endTime != ''">
-        AND (t.policyEndDate &gt;= #{startTime} or t.policyEndDate &lt;= #{endTime})
-    </if>
-</where>
+
 
 
     </select>

+ 4 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -549,6 +549,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                     vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
                     vo.setRewardCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("rewardCost","")+"");//赠款消耗
                     BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
+                    vo.setTime(stringMap.get("startDate")+"----"+stringMap.get("endDate"));
                     resultList.add(vo);
                     policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"),stringMap.get("endDate")));
                 }
@@ -575,6 +576,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                     vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
                     vo.setRewardCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("rewardCost","")+"");//赠款消耗
                     BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
+                    vo.setTime(stringMap.get("startDate")+"----"+stringMap.get("endDate"));
                     resultList.add(vo);
                 }
             }
@@ -685,13 +687,13 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                         vo.setRebateType("");
                     }
 
-
                     // 时间段内 账户流水 信息
                     List<Map<String,Object>> listAccount = reportSettlementMapper.getProfitKuaiShouCost(map.get("accountId")+"",stringMap.get("startDate"),stringMap.get("endDate"));
                     listAccount.removeAll(Collections.singleton(null));
                     vo.setCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cost","")+"");//总消耗
                     vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
                     BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
+                    vo.setTime(stringMap.get("startDate")+"----"+stringMap.get("endDate"));
                     resultList.add(vo);
                     policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"),stringMap.get("endDate")));
                 }
@@ -717,6 +719,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                     vo.setCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cost","")+"");//总消耗
                     vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
                     BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
+                    vo.setTime(stringMap.get("startDate")+"----"+stringMap.get("endDate"));
                     resultList.add(vo);
                 }
 

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -142,6 +142,8 @@ public class LoginController {
 				}
 				String departId = sysDepartService.selectIdByOrdCode(sysUser.getOrgCode());
 				sysUser.setDepartId(departId);
+				//根据 账号 查看该用户以及角色名称
+				sysUser = sysUserService.getUserByName(sysUser.getUsername());
 				result = sysUserService.checkUserIsEffective(sysUser);
 				if (!result.isSuccess()) {
 					return result;