111

k94314517

2023-08-24 06997ad92d77b7dd8a002df16b5b0cadc528d5f5

111

 server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java

@@ -7,6 +7,7 @@
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
import doumeemes.dao.business.model.UnqualifiedRecord;
import doumeemes.dao.business.vo.UnqualifiedRecordVO;
import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.QueryUnQualifiedRecordDTO;
import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
@@ -15,6 +16,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -22,6 +24,8 @@
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;

/**
 * Created by IntelliJ IDEA.
@@ -31,7 +35,7 @@
 */

@RestController
@RequestMapping("/ext/unqualifiedRecord")
@RequestMapping("/business/unqualifiedRecord")
@Api(tags = "工单类-报工不良记录类型表")
public class UnqualifiedRecordExtController  extends BaseController {

@@ -47,7 +51,14 @@
    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    public void exportExcel (@RequestBody PageWrap<QueryUnQualifiedRecordDTO> pageWrap, HttpServletResponse response) throws Exception{
        ExcelExporter.build(UnqualifiedRecord.class).export(unqualifiedRecordService.findJoinPage(pageWrap).getRecords(), "不良产出明细记录"+ DateUtil.getNowLongTime(), response);
        List<UnqualifiedRecord> list  = unqualifiedRecordService.findJoinPage(pageWrap).getRecords();
        List<UnqualifiedRecordVO> voList = new ArrayList<>();
        list.forEach(i->{
            UnqualifiedRecordVO unqualifiedRecordVO = new UnqualifiedRecordVO();
            BeanUtils.copyProperties(i,unqualifiedRecordVO);
            voList.add(unqualifiedRecordVO);
        });
        ExcelExporter.build(UnqualifiedRecordVO.class).export(voList, "不良产出明细记录"+ DateUtil.getNowLongTime(), response);
    }

}

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

@@ -9,6 +9,7 @@
import doumeemes.core.utils.Constants;
import doumeemes.dao.business.dto.CompanyInitDataDTO;
import doumeemes.dao.ext.dto.WxLoginDTO;
import doumeemes.dao.ext.dto.WxLoginOutDTO;
import doumeemes.dao.ext.vo.WxLoginVO;
import doumeemes.dao.system.dto.LoginDTO;
import doumeemes.dao.system.dto.UpdatePwdDto;
@@ -81,6 +82,14 @@
        return ApiResponse.success(wxLoginService.wxLoginByPassword(dto, request));
    }

    @PreventRepeat(limit = 10, lockTime = 10000)
    @ApiOperation("微信退出登录")
    @PostMapping("/wxLoginOut")
    public ApiResponse wxLoginOut (@Validated @RequestBody WxLoginOutDTO dto, HttpServletRequest request) {
        wxLoginService.wxLoginOut(dto);
        return ApiResponse.success("操作成功");
    }

    @ApiOperation("退出登录")
    @PostMapping("/logout")
    public ApiResponse logout () {

 server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java

@@ -23,6 +23,7 @@
public class UnqualifiedRecord {

    @TableId(type = IdType.AUTO)
    @ExcelColumn(name="主键",index = 0,width =15)
    @ApiModelProperty(value = "主键", example = "1")
    private Integer id;


 server/src/main/java/doumeemes/dao/business/vo/UnqualifiedRecordVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
package doumeemes.dao.business.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * å·¥å•ç±»-报工不良记录类型表
 * @author æ±Ÿè¹„蹄
 * @since 2023/08/16 14:15
 */
@Data
public class UnqualifiedRecordVO {


    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间",index = 7,width =15)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createTime;

    @ApiModelProperty(value = "检验不合格数量", example = "1")
    @ExcelColumn(name="数量",index = 6,width =15)
    private BigDecimal unqualifiedNum;

    @ApiModelProperty(value = "工单编码", example = "1")
    @ExcelColumn(name="工单编码",index = 1,width =15)
    private String workOrderCode;

    @ApiModelProperty(value = "物料名称", example = "1")
    @ExcelColumn(name="物料名称",index = 2,width =15)
    private String materialName;

    @ApiModelProperty(value = "物料编码", example = "1")
    @ExcelColumn(name="物料编码",index = 3,width =15)
    private String materialCode;

    @ApiModelProperty(value = "工序", example = "1")
    @ExcelColumn(name="工序",index = 4,width =15)
    private String proceduresName;

    @ApiModelProperty(value = "不良项", example = "1")
    @ExcelColumn(name="不良项",index = 5,width =15)
    private String categoryName;

    @ApiModelProperty(value = "创建人", example = "1")
    @ExcelColumn(name="创建人",index = 8,width =15)
    private String createUserName;
}

 server/src/main/java/doumeemes/dao/ext/dto/WxLoginOutDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package doumeemes.dao.ext.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/8/11 10:10
 */
@Data
public class WxLoginOutDTO {

    @ApiModelProperty(value = "用户主键")
    private Integer companyUserId;

}

 server/src/main/java/doumeemes/service/system/WxLoginService.java

@@ -1,6 +1,7 @@
package doumeemes.service.system;

import doumeemes.dao.ext.dto.WxLoginDTO;
import doumeemes.dao.ext.dto.WxLoginOutDTO;
import doumeemes.dao.ext.vo.WxLoginVO;
import doumeemes.dao.system.dto.LoginDTO;

@@ -18,4 +19,6 @@


    String wxLoginByPassword (WxLoginDTO dto, HttpServletRequest request);

    void wxLoginOut(WxLoginOutDTO wxLoginOutDTO);
}

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

@@ -19,6 +19,7 @@
import doumeemes.dao.ext.DepartmentExtMapper;
import doumeemes.dao.ext.dto.QueryCompanyUserExtDTO;
import doumeemes.dao.ext.dto.WxLoginDTO;
import doumeemes.dao.ext.dto.WxLoginOutDTO;
import doumeemes.dao.ext.vo.CompanyUserExtListVO;
import doumeemes.dao.ext.vo.WxLoginVO;
import doumeemes.dao.system.SystemUserMapper;
@@ -223,4 +224,14 @@
        }
    }

    @Override
    public void wxLoginOut(WxLoginOutDTO wxLoginOutDTO) {
        if(Objects.isNull(wxLoginOutDTO)&&!Objects.isNull(wxLoginOutDTO.getCompanyUserId())){
            companyUserExtMapper.update(null,new UpdateWrapper<CompanyUser>()
                    .set("UNIONID","").set("OPENID","")
                    .eq("id",wxLoginOutDTO.getCompanyUserId())
            );
        }
    }

}