bug

jiangping

2023-11-07 64b432916af9c9218ab3f3eca614e26c542142ae

bug

 server/src/main/java/doumeemes/api/system/SystemLoginLogController.java

@@ -7,20 +7,7 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> dev
import doumeemes.dao.business.model.Backorder;
import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
<<<<<<< HEAD
=======
import doumeemes.dao.ext.dto.CompanyLoginDTO;
>>>>>>> 1.0.3
=======
>>>>>>> dev
import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
import doumeemes.dao.system.model.SystemLoginLog;
@@ -61,8 +48,6 @@
    @RequiresPermissions("system:loginLog:query")
    public void export (@RequestBody PageWrap<QuerySystemLoginLogDTO> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(SystemLoginLog.class).exportWithFirstAndEnd(systemLoginLogService.findPage(pageWrap).getRecords(), "登录日志_"+System.currentTimeMillis(),"登录日志-"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
<<<<<<< HEAD
=======
    }


@@ -77,31 +62,8 @@
    @ApiOperation("企业登录统计导出")
//    @RequiresPermissions("system:loginLog:query")
    public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
<<<<<<< HEAD
        ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(),"企业登录统计_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
>>>>>>> 1.0.3
    }


    @PostMapping("/companyLoginStatisticsPage")
    @ApiOperation("企业登录统计")
//    @RequiresPermissions("system:loginLog:query")
    public ApiResponse<PageData<CompanyLoginStatisticsVO>> companyLoginStatisticsPage (@RequestBody PageWrap<CompanyLoginDTO> pageWrap) {
        return ApiResponse.success(systemUserService.companyLoginStatisticsPage(pageWrap));
    }

    @PostMapping("/companyLoginStatisticsExport")
    @ApiOperation("企业登录统计导出")
//    @RequiresPermissions("system:loginLog:query")
    public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
        //ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(),"企业登录统计",null, response);
        ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(), response);
    }

=======
        //ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(),"企业登录统计",null, response);
        ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(), response);
    }

>>>>>>> dev
}

 server/src/main/java/doumeemes/config/shiro/ShiroToken.java

@@ -1,13 +1,6 @@
package doumeemes.config.shiro;

<<<<<<< HEAD
<<<<<<< HEAD
import doumeemes.core.model.LoginUserInfo;
=======
>>>>>>> 1.0.3
=======
import doumeemes.core.model.LoginUserInfo;
>>>>>>> dev
import org.apache.shiro.authc.UsernamePasswordToken;
import org.springframework.stereotype.Component;


 server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java

@@ -17,8 +17,6 @@
public class CompanyLoginStatisticsVO {

    @ApiModelProperty(value = "时间 yyyy-MM-dd")
<<<<<<< HEAD
<<<<<<< HEAD
    @ExcelColumn(name="时间",width = 6,align = HorizontalAlignment.CENTER,index = 0)
    private String dataDate;

@@ -32,28 +30,6 @@

    @ApiModelProperty(value = "登录次数")
    @ExcelColumn(name="登录次数",width = 6,align = HorizontalAlignment.CENTER,index = 3)
=======
    @ExcelColumn(name="时间",width = 6,align = HorizontalAlignment.CENTER)
=======
    @ExcelColumn(name="时间",width = 6,align = HorizontalAlignment.CENTER,index = 0)
>>>>>>> dev
    private String dataDate;

    @ApiModelProperty(value = "登录企业名称")
    @ExcelColumn(name="登录企业名称",width = 8,align = HorizontalAlignment.CENTER,index = 1)
    private String companyName;

    @ApiModelProperty(value = "渠道")
    @ExcelColumn(name="渠道", valueMapping = "0=PC平台;1=钉钉平台;2=羚羊平台;3=EDGP平台;4=微信小程序",width = 6,align = HorizontalAlignment.CENTER,index = 2)
    private Integer orgin;

    @ApiModelProperty(value = "登录次数")
<<<<<<< HEAD
    @ExcelColumn(name="登录次数",width = 6,align = HorizontalAlignment.CENTER)
>>>>>>> 1.0.3
=======
    @ExcelColumn(name="登录次数",width = 6,align = HorizontalAlignment.CENTER,index = 3)
>>>>>>> dev
    private Integer loginNum;

}

 server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java

@@ -104,20 +104,4 @@
    @ApiModelProperty(value = "登录时间")
    @ExcelColumn(name="登录时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 10)
    private Date loginTime;
<<<<<<< HEAD
<<<<<<< HEAD
=======
    @ApiModelProperty(value = "企业名称")
    @ExcelColumn(name="企业名称", color = IndexedColors.RED, width = 16)
    @TableField(exist = false)
    private String  companyName;

    @ApiModelProperty(value = "企业用户名称")
    @ExcelColumn(name="企业用户名称", color = IndexedColors.RED, width = 16)
    @TableField(exist = false)
    private String  companyUserName;

>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
=======
>>>>>>> 1.0.3
}

 server/src/main/java/doumeemes/service/business/impl/WorkorderCheckAttrServiceImpl.java

@@ -183,7 +183,8 @@
        for(int i=0;i<attrList.size();i++){
            WorkorderCheckAttr wa=attrList.get(i);
            CheckAttr attr =  checkAttrExtMapper.selectById(wa.getAttrId()) ;
            if(attr == null || !Constants.equalsInteger(attr.getRootDepartId(),mp.getRootDepartId())|| !Constants.equalsInteger(attr.getProcedureId(),mp.getProcedureId())){
//            if(attr == null || !Constants.equalsInteger(attr.getRootDepartId(),mp.getRootDepartId())|| !Constants.equalsInteger(attr.getProcedureId(),mp.getProcedureId())){
            if(attr == null || !Constants.equalsInteger(attr.getRootDepartId(),mp.getRootDepartId())){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "对不起，请选择正确的检点属性！");
            }
            if( Constants.equalsInteger(attr.getIsRequired(),Constants.ONE) && StringUtils.isBlank(wa.getVal())){

 server/src/main/java/doumeemes/service/ext/impl/CheckAttrExtServiceImpl.java

@@ -107,7 +107,7 @@
        if(query.getWorkOrderID()!=null){
            Workorder workorder= workorderServiceimpl.findById(query.getWorkOrderID());
            if(workorder!=null){
                query.setProcedureId(workorder.getProcedureId());
//                query.setProcedureId(workorder.getProcedureId());
            }else{
               // return ApiResponse.failed("工单不存在");
            }

 server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java

@@ -235,9 +235,9 @@
                        .eq("MATERIAL_ID",w.getMaterialId())
                        .eq("DEPART_ID",w.getDepartId())
                        .eq("DELETED",Constants.ZERO)
                        .eq("STATUS",Constants.ONE)
//                        .eq("STATUS",Constants.ONE)
                );
                w.setPapercode(b.getPapercode());
                w.setPapercode(b!=null?b.getPapercode():null);

              /*  RouteProcedure currentRouteProcedure   = routeProcedureExtMapper.selectOne(new QueryWrapper<RouteProcedure>()
                        .eq("ROUTE_ID",b.getRouteId())

 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java

@@ -137,14 +137,6 @@
            for(WorkorderRecordExtListVO model : result){
                //查询生产人员姓名
                initProUser(user,model,allDepartList);
<<<<<<< HEAD
//                BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
//                s.divide(new BigDecimal(0),2);
//                model.setSalary(s.doubleValue());
=======
//                int s= Constants.formatIntegerNum(model.getSalary());
//                model.setSalaryYuan(new BigDecimal(s).divide(new BigDecimal(100),2));
>>>>>>> dev
            }
        }
        return PageData.from(new PageInfo<>(result));

 server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java

@@ -4,14 +4,7 @@
import com.github.pagehelper.PageInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
<<<<<<< HEAD
<<<<<<< HEAD
import doumeemes.core.utils.DateUtil;
=======
>>>>>>> 1.0.3
=======
import doumeemes.core.utils.DateUtil;
>>>>>>> dev
import doumeemes.dao.ext.dto.ActivityLoginDTO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.vo.ActivityLoginVO;
@@ -205,18 +198,9 @@

    @Override
    public List<ActivityLoginVO> activityLoginVOList(ActivityLoginDTO activityLoginDTO) {
<<<<<<< HEAD
<<<<<<< HEAD
        if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
            activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
        }
=======
>>>>>>> 1.0.3
=======
        if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
            activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
        }
>>>>>>> dev
        return systemUserMapper.activityLoginVOList(activityLoginDTO);
    }