## 见点奖考核添加复购考核时间判断处理;
This commit is contained in:
parent
05d4cdb059
commit
a65fbea4ab
|
|
@ -333,7 +333,9 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
|
||||||
* @param assessTableName
|
* @param assessTableName
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
int updateCuMemberSettlePointAssess(@Param("settleTableName") String settleTableName, @Param("assessTableName") String assessTableName);
|
int updateCuMemberSettlePointAssess(@Param("settleTableName") String settleTableName,
|
||||||
|
@Param("assessTableName") String assessTableName,
|
||||||
|
@Param("settleDate") String settleDate);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 初始化考核数据
|
* 初始化考核数据
|
||||||
|
|
|
||||||
|
|
@ -339,7 +339,7 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
|
||||||
* @param settleTableName
|
* @param settleTableName
|
||||||
* @param assessTableName
|
* @param assessTableName
|
||||||
*/
|
*/
|
||||||
void updateCuMemberSettlePointAssess(String settleTableName, String assessTableName);
|
void updateCuMemberSettlePointAssess(String settleTableName, String assessTableName, String settleDate);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 初始化考核数据
|
* 初始化考核数据
|
||||||
|
|
|
||||||
|
|
@ -436,8 +436,8 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateCuMemberSettlePointAssess(String settleTableName, String assessTableName) {
|
public void updateCuMemberSettlePointAssess(String settleTableName, String assessTableName, String settleDate) {
|
||||||
baseMapper.updateCuMemberSettlePointAssess(settleTableName, assessTableName);
|
baseMapper.updateCuMemberSettlePointAssess(settleTableName, assessTableName, settleDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -426,7 +426,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
|
||||||
// 初始化考核数据
|
// 初始化考核数据
|
||||||
iCuMemberTreeService.initAssessDate(currentSettleTableName);
|
iCuMemberTreeService.initAssessDate(currentSettleTableName);
|
||||||
// 更新日结表会员免考信息
|
// 更新日结表会员免考信息
|
||||||
iCuMemberTreeService.updateCuMemberSettlePointAssess(currentSettleTableName, assessTableName);
|
iCuMemberTreeService.updateCuMemberSettlePointAssess(currentSettleTableName, assessTableName, settleDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -1185,7 +1185,10 @@
|
||||||
from ${assessTableName} cma
|
from ${assessTableName} cma
|
||||||
where cma.del_flag = 0
|
where cma.del_flag = 0
|
||||||
and cma.assess_type = 5
|
and cma.assess_type = 5
|
||||||
and cma.assess_status in (0, 1)) tmp
|
and cma.assess_status in (0, 1)
|
||||||
|
and to_date(#{settleDate}, 'yyyy-mm-dd') >= cma.start_date
|
||||||
|
and cma.end_date >= to_date(#{settleDate}, 'yyyy-mm-dd')
|
||||||
|
) tmp
|
||||||
on (tmp.pk_member = cms.pk_member)
|
on (tmp.pk_member = cms.pk_member)
|
||||||
when matched then
|
when matched then
|
||||||
update set cms.is_maker_space = 0
|
update set cms.is_maker_space = 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue