Merge remote-tracking branch 'origin/dev/feat/partner1.5.2_20231121' into dev/feat/partner1.5.2_20231121

This commit is contained in:
feng.li
2023-11-20 14:37:21 +08:00
2 changed files with 7 additions and 6 deletions

View File

@@ -57,6 +57,7 @@ public class HyPartnerLineInfoDAO {
} }
public int updateByPrimaryKeySelective(HyPartnerLineInfoDO hyPartnerLineInfoDO){ public int updateByPrimaryKeySelective(HyPartnerLineInfoDO hyPartnerLineInfoDO){
hyPartnerLineInfoDO.setUpdateTime(new Date());
return hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineInfoDO); return hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
} }

View File

@@ -335,22 +335,22 @@
<if test="userId!=null and userId!=''"> <if test="userId!=null and userId!=''">
and hpli.investment_manager = #{userId} and hpli.investment_manager = #{userId}
</if> </if>
<if test="workflowStage!=null and workflowStage!='' and workflowStage=='4' and workflowStage!=null and workflowStage!='' and workflowStage=='1'"> <if test="workflowStatus!=null and workflowStatus!='' and workflowStatus==4 and workflowStage!=null and workflowStage!='' and workflowStage==1 ">
order by hpli.create_time order by hpli.create_time
</if> </if>
<if test="workflowStage!=null and workflowStage!='' and workflowStage=='5' and workflowStage!=null and workflowStage!='' and workflowStage=='1'"> <if test="workflowStatus!=null and workflowStatus!='' and workflowStatus==5 and workflowStage!=null and workflowStage!='' and workflowStage==1 ">
order by hpli.update_time order by hpli.update_time
</if> </if>
<if test="workflowStage!=null and workflowStage!='' and workflowStage=='1' and workflowStage!=null and workflowStage!='' and workflowStage=='2'"> <if test="workflowStatus!=null and workflowStatus!='' and workflowStatus==1 and workflowStage!=null and workflowStage!='' and workflowStage==2 ">
order by hpli.create_time order by hpli.create_time
</if> </if>
<if test="workflowStage!=null and workflowStage!='' and workflowStage=='0' and workflowStage!=null and workflowStage!='' and workflowStage=='2'"> <if test="workflowStatus!=null and workflowStatus!='' and workflowStatus==0 and workflowStage!=null and workflowStage!='' and workflowStage==2 ">
order by hpli.update_time order by hpli.update_time
</if> </if>
<if test="workflowStage!=null and workflowStage!='' and workflowStage=='4' and workflowStage!=null and workflowStage!='' and workflowStage=='3'"> <if test="workflowStatus!=null and workflowStatus!='' and workflowStatus==4 and workflowStage!=null and workflowStage!='' and workflowStage==3 ">
order by hpli.create_time order by hpli.create_time
</if> </if>
<if test="workflowStage!=null and workflowStage!='' and workflowStage=='5' and workflowStage!=null and workflowStage!='' and workflowStage=='3'"> <if test="workflowStatus!=null and workflowStatus!='' and workflowStatus==5 and workflowStage!=null and workflowStage!='' and workflowStage==3 ">
order by hpli.update_time order by hpli.update_time
</if> </if>
</select> </select>