Pu Zhibing
3 天以前 25cf266e99714ac5d428e66b40ce272325c91dd8
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
@@ -72,20 +73,20 @@
    public Object list(String createTime) {
        Date startTimes = null;
        Date endTimes = null;
        if (SinataUtil.isNotEmpty(createTime)){
        if (SinataUtil.isNotEmpty(createTime)) {
            String[] timeArray = createTime.split(" - ");
            startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
            endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
            startTimes = DateUtil.getDate_str3(timeArray[0] + " 00:00:00");
            endTimes = DateUtil.getDate_str3(timeArray[1] + " 23:59:59");
        }
        Page<SysRedPacketRecord> page = new PageFactory<SysRedPacketRecord>().defaultPage();
        Wrapper wrapper = new EntityWrapper<SysRedPacketRecord>();
        if(SinataUtil.isNotEmpty(createTime)){
            wrapper.between("insertTime",startTimes,endTimes);
        if (SinataUtil.isNotEmpty(createTime)) {
            wrapper.between("insertTime", startTimes, endTimes);
        }
        wrapper.eq("companyId",ShiroKit.getUser().getObjectId());
        wrapper.eq("companyType",ShiroKit.getUser().getRoleType());
        wrapper.orderBy("id",false);
        return super.packForBT(sysRedPacketRecordService.selectPage(page,wrapper));
        wrapper.eq("companyId", ShiroExtUtil.getUser().getObjectId());
        wrapper.eq("companyType", ShiroExtUtil.getUser().getRoleType());
        wrapper.orderBy("id", false);
        return super.packForBT(sysRedPacketRecordService.selectPage(page, wrapper));
    }
    /**
@@ -95,8 +96,8 @@
    @ResponseBody
    public Object add(SysRedPacketRecord sysRedPacketRecord) {
        sysRedPacketRecord.setInsertTime(new Date());
        sysRedPacketRecord.setCompanyId(ShiroKit.getUser().getObjectId());
        sysRedPacketRecord.setCompanyType(ShiroKit.getUser().getRoleType());
        sysRedPacketRecord.setCompanyId(ShiroExtUtil.getUser().getObjectId());
        sysRedPacketRecord.setCompanyType(ShiroExtUtil.getUser().getRoleType());
        sysRedPacketRecordService.insert(sysRedPacketRecord);
        return SUCCESS_TIP;
    }